home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/pages/merge_requests.scss
+5
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 {
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+2 -2
View File
@@ -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