diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 20:35:36 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 20:35:36 +0000 |
| commit | 5fb5fd253a960ed33eebc0f6aabeae37aa175fa8 (patch) | |
| tree | 2cf0d33900391e272fd2ded9f17b4d5af713f441 | |
| parent | c5eb2977d7750a6f3255941f72a1002259468834 (diff) | |
| parent | ab6aa8a48bbee2b62a2ddc0a2a7807109d814f0a (diff) | |
| download | gitlab-ce-5fb5fd253a960ed33eebc0f6aabeae37aa175fa8.tar.gz | |
Merge branch 'nicer-merge-conflicts-widget' into 'master'
Split merge conflict messages on 2 lines
Before
After
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1107
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 3 |
1 files changed, 2 insertions, 1 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 d1db5fec43a..7dc3b4eb2cc 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -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 |