Files · edba48c6c4e08b826a9b5267f3b77e3024643214 · 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
app		Loading commit data...
bin		Loading commit data...
builds		Loading commit data...
config		Loading commit data...
db		Loading commit data...
doc		Loading commit data...
docker		Loading commit data...
features		Loading commit data...
fixtures/emojis		Loading commit data...
generator_templates/active_record/migration		Loading commit data...
lib		Loading commit data...
log		Loading commit data...
public		Loading commit data...
scripts		Loading commit data...
shared		Loading commit data...
spec		Loading commit data...
tmp		Loading commit data...
vendor		Loading commit data...
.csscomb.json		Loading commit data...
.flayignore		Loading commit data...
.foreman		Loading commit data...
.gitattributes		Loading commit data...
.gitignore		Loading commit data...
.gitlab-ci.yml		Loading commit data...
.hound.yml		Loading commit data...
.pkgr.yml		Loading commit data...
.rspec		Loading commit data...
.rubocop.yml		Loading commit data...
.ruby-version		Loading commit data...
.scss-lint.yml		Loading commit data...
.simplecov		Loading commit data...
.teatro.yml		Loading commit data...
.vagrant_enabled		Loading commit data...
CHANGELOG		Loading commit data...
CONTRIBUTING.md		Loading commit data...
GITLAB_SHELL_VERSION		Loading commit data...
GITLAB_WORKHORSE_VERSION		Loading commit data...
Gemfile		Loading commit data...
Gemfile.lock		Loading commit data...
LICENSE		Loading commit data...
MAINTENANCE.md		Loading commit data...
PROCESS.md		Loading commit data...
Procfile		Loading commit data...
README.md		Loading commit data...
Rakefile		Loading commit data...
VERSION		Loading commit data...
config.ru		Loading commit data...
doc_styleguide.md		Loading commit data...
docker-compose.yml		Loading commit data...

README.md