app/views/projects/merge_requests · 828a15bccd5a6fe0471e97ebd5c0c0f6f674b9b7 · Forest Godfrey / gitlab-ce

Merge branch 'merge-conflicts-icon-color' into 'master' · edba48c6

authored Jun 09, 2016

Use warning color merge conflicts icon in MR status widget.

Fixes #18174 

### Before
![Screen_Shot_2016-06-06_at_18.00.56](/uploads/4a74b1710478daee5ee95b7c6b6a835f/Screen_Shot_2016-06-06_at_18.00.56.png)

### After
![Screen_Shot_2016-06-06_at_17.58.04](/uploads/28faefaebef30e4256390029c87b28bb/Screen_Shot_2016-06-06_at_17.58.04.png)

See merge request !4487

edba48c6

Name	Last commit	Last update
..
dropdowns		Loading commit data...
show		Loading commit data...
widget		Loading commit data...
_discussion.html.haml		Loading commit data...
_form.html.haml		Loading commit data...
_head.html.haml		Loading commit data...
_merge_request.html.haml		Loading commit data...
_merge_requests.html.haml		Loading commit data...
_new_compare.html.haml		Loading commit data...
_new_submit.html.haml		Loading commit data...
_show.html.haml		Loading commit data...
branch_from.html.haml		Loading commit data...
branch_to.html.haml		Loading commit data...
cancel_merge_when_build_succeeds.js.haml		Loading commit data...
diffs.html.haml		Loading commit data...
edit.html.haml		Loading commit data...
index.html.haml		Loading commit data...
invalid.html.haml		Loading commit data...
merge.js.haml		Loading commit data...
new.html.haml		Loading commit data...
show.html.haml		Loading commit data...
update_branches.html.haml		Loading commit data...