diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-10 22:38:33 -0500 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:50 +0300 |
| commit | add01596cf497e0138282830fb1cc43f2c0bb124 (patch) | |
| tree | 9a973670aae88c3648b776fbf018ae1781c200eb /app/views/projects/merge_requests/widget/open | |
| parent | 5e1e08e5ceee070582138c33e38bc8743583d064 (diff) | |
| download | gitlab-ce-add01596cf497e0138282830fb1cc43f2c0bb124.tar.gz | |
Show tooltip when conflicts cannot be resolved through GitLab
Diffstat (limited to 'app/views/projects/merge_requests/widget/open')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 8 |
1 files changed, 7 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 60ea0795bfb..af3096f04d9 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -7,7 +7,13 @@ - if @merge_request.conflicts_can_be_resolved_by?(current_user) - if @merge_request.conflicts_can_be_resolved_in_ui? = link_to "resolve these conflicts", conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) - or + - else + %span.has-tooltip{title: "These conflicts cannot be resolved through GitLab"} + resolve these conflicts locally + - else + resolve these conflicts + + or - if @merge_request.can_be_merged_via_command_line_by?(current_user) #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}. |