diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-06 15:58:10 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-06 15:58:10 +0200 |
| commit | 92cb78749534567d9480e1753ca4fdb0cced3b39 (patch) | |
| tree | 6d7b9334a30a105325ed6fce6a0659f4e37ac27c /app/views | |
| parent | d187ffebee8170877df9a99ec995ffd81aac2201 (diff) | |
| download | gitlab-ce-92cb78749534567d9480e1753ca4fdb0cced3b39.tar.gz | |
Better cannot-be-merged widget for MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 07386197bc6..d210d4667fd 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -31,10 +31,12 @@ .automerge_widget.cannot_be_merged.hide .bs-callout.bs-callout-disabled + %h4 + This request can't be merged with GitLab. %span - = link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal" - - %strong This request can't be merged with GitLab. You should do it manually + You should do it manually with + %strong + = link_to "command line", "#modal_merge_info", class: "how_to_merge_link", title: "How To Merge", "data-toggle" => "modal" .automerge_widget.unchecked .bs-callout.bs-callout-warning |