diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 20:28:47 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 20:28:47 +0000 |
| commit | edba48c6c4e08b826a9b5267f3b77e3024643214 (patch) | |
| tree | e96015fde0ebd02b9eff4c7da8b31c78cf950ea5 /app/views/projects/merge_requests | |
| parent | 787b73f5d6dafb3db36a9113a59e3bc5b047a4b9 (diff) | |
| parent | 028592eba6485e574fb0fb42937519b9e8ace37d (diff) | |
| download | gitlab-ce-edba48c6c4e08b826a9b5267f3b77e3024643214.tar.gz | |
Merge branch 'merge-conflicts-icon-color' into 'master'
Use warning color merge conflicts icon in MR status widget.
Fixes #18174
### Before
### After
See merge request !4487
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index e6c089fefb2..06ab0a3fa00 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -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 |