kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve UX for widget if merge request can not be merged

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2015-01-28 11:25:13 -08:00
parent 965cec68ac
commit b40809d731
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/sections/merge_requests.scss
View file

@ -122,6 +122,7 @@
background: $box_bg; background: $box_bg;
margin-bottom: 20px; margin-bottom: 20px;
color: #666; color: #666;
border: 1px solid #EEE;
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09)); @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));
.ci_widget { .ci_widget {

11
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file

@ -45,10 +45,17 @@
.automerge_widget.cannot_be_merged.hide .automerge_widget.cannot_be_merged.hide
%h4 %h4
This request can't be merged with GitLab. This request can't be merged with GitLab.
%p
You should do it manually with You should do it manually with
%strong %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 .automerge_widget.unchecked
%p %p