Merge branch '21135-resolve-these-conflicts-link-is-too-subtle' into 'master'
Replace link to Resolve conflicts with buttons Closes #21135 See merge request !8229
This commit is contained in:
commit
de87c6f687
2 changed files with 20 additions and 14 deletions
|
@ -1,21 +1,23 @@
|
|||
- can_resolve = @merge_request.conflicts_can_be_resolved_by?(current_user)
|
||||
- can_resolve_in_ui = @merge_request.conflicts_can_be_resolved_in_ui?
|
||||
- can_merge = @merge_request.can_be_merged_via_command_line_by?(current_user)
|
||||
|
||||
%h4.has-conflicts
|
||||
= icon("exclamation-triangle")
|
||||
This merge request contains merge conflicts
|
||||
|
||||
%p
|
||||
Please
|
||||
- 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)
|
||||
- else
|
||||
%span.has-tooltip{title: "These conflicts cannot be resolved through GitLab"}
|
||||
resolve these conflicts locally
|
||||
- else
|
||||
resolve these conflicts
|
||||
|
||||
To merge this request, resolve these conflicts
|
||||
- if can_resolve && !can_resolve_in_ui
|
||||
locally
|
||||
or
|
||||
- unless can_merge
|
||||
ask someone with write access to this repository to
|
||||
merge it locally.
|
||||
|
||||
- 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"}.
|
||||
- else
|
||||
ask someone with write access to this repository to merge this request manually.
|
||||
- if (can_resolve && can_resolve_in_ui) || can_merge
|
||||
.btn-group
|
||||
- if can_resolve && can_resolve_in_ui
|
||||
= link_to "Resolve conflicts", conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn"
|
||||
- if can_merge
|
||||
= link_to "Merge locally", "#modal_merge_info", class: "btn how_to_merge_link vlink", "data-toggle" => "modal"
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Improve visibility of "Resolve conflicts" and "Merge locally" actions
|
||||
merge_request: 8229
|
||||
author:
|
Loading…
Reference in a new issue