kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use warning color merge conflicts icon in MR status widget.

Browse source
This commit is contained in:
Fatih Acet 2016-06-06 17:59:20 +03:00
parent 316630ad2c
commit 028592eba6
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/pages/merge_requests.scss
View file

@ -105,6 +105,11 @@
font-size: 17px;
margin: 5px 0;
color: $gl-gray-dark;
&.has-conflicts .fa-exclamation-triangle {
color: $gl-warning;
}
}
p:last-child {

2
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
View file

@ -1,4 +1,4 @@
%h4
%h4.has-conflicts
= icon("exclamation-triangle")
This merge request contains merge conflicts