root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'nicer-merge-conflicts-widget' into 'master' 

Split merge conflict messages on 2 lines

Before

![Screenshot_2015-08-06_17.19.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a2757ca0a8f4acbf4152234e050b739e/Screenshot_2015-08-06_17.19.48.png)

After

![Screenshot_2015-08-06_17.22.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/11eeab533f98f008fb9548c0eb039aa3/Screenshot_2015-08-06_17.22.58.png)


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !1107
This commit is contained in:
Dmitriy Zaporozhets 2015-08-06 20:35:36 +00:00
parent c5eb2977d7 ab6aa8a48b
commit 5fb5fd253a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
View File

@ -1,7 +1,8 @@
- if @merge_request.can_be_merged_by?(current_user)
%h4
This merge request contains merge conflicts that must be resolved.
You can try it manually on the
%p
You can merge it manually using the
%strong
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
- else