diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-28 22:25:13 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-28 22:25:13 +0300 |
| commit | b40809d73135ada0e82c826f96e6cb1dd6fbaa7c (patch) | |
| tree | beede8d93a546c81fb39f61401c553092b47becc /app/views/projects/merge_requests | |
| parent | 965cec68accf9e9c2137e433ab00283f2ae6987f (diff) | |
Improve UX for widget if merge request can not be merged
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 11 |
1 files changed, 9 insertions, 2 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 11a111e5faa..f8ee6973637 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -45,10 +45,17 @@ .automerge_widget.cannot_be_merged.hide %h4 This request can't be merged with GitLab. - %p 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" + = link_to "#modal_merge_info", class: "underlined-link how_to_merge_link", title: "How To Merge", "data-toggle" => "modal" do + command line + + %p + %button.btn.disabled + %i.fa.fa-warning + Accept Merge Request + + This usually happens when git can not resolve conflicts between branches automatically. .automerge_widget.unchecked %p |