Use warning color merge conflicts icon in MR status widget.
This commit is contained in:
parent
316630ad2c
commit
028592eba6
2 changed files with 7 additions and 2 deletions
|
@ -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 {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
%h4
|
||||
%h4.has-conflicts
|
||||
= icon("exclamation-triangle")
|
||||
This merge request contains merge conflicts
|
||||
|
||||
%p
|
||||
Please resolve these conflicts or
|
||||
Please resolve these conflicts or
|
||||
- if @merge_request.can_be_merged_by?(current_user)
|
||||
#{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
|
||||
- else
|
||||
|
|
Loading…
Reference in a new issue