Skip to content
Snippets Groups Projects
Commit b40809d7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Improve UX for widget if merge request can not be merged

parent 965cec68
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -122,6 +122,7 @@
background: $box_bg;
margin-bottom: 20px;
color: #666;
border: 1px solid #EEE;
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));
 
.ci_widget {
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment