deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

MR: Accept section polished. Show permission info

Browse source
This commit is contained in:
randx 2012-05-28 20:19:54 +03:00
parent b729004a50
commit 89043d6b89
2 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/stylesheets/common.scss
View file

@ -969,3 +969,23 @@ li.note {
vertical-align:top;
}
}
.automerge_widget {
&.can_be_merged {
background: #DFF0D8;
}
.accept_merge_request {
color: #fff;
text-shadow: 0 1px 1px #222;
background: #5bb75b;;
&:hover {
background-color: #51a351;
color: #fff;
}
}
.how_to_merge_link {
@extend .primary;
}
}

29
app/views/merge_requests/show.html.haml
View file

@ -53,30 +53,35 @@
Closed by #{@merge_request.closed_event.author_name}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
- unless can?(current_user, :accept_mr, @project)
.alert-message
%strong Only masters can accept MR
- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
.automerge_widget.can_be_merged{:style => "display:none"}
.ui-box.padded
%p
.alert.alert-success
%span
= link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
 
You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
= link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
 
.automerge_widget.cannot_be_merged{:style => "display:none"}
.alert-message
%p
%strong This request cant be merged with GitLab. You should do it manually  
.alert.alert-info
%span
= link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
 
%strong This request cant be merged with GitLab. You should do it manually
.automerge_widget.unchecked
.alert-message
%p
%strong Checking for ability to automatically merge…
%strong
%i.icon-refresh
Checking for ability to automatically merge…
.automerge_widget.already_cannot_be_merged{:style => "display:none"}
.alert-message
%p
%strong This merge request already can not be merged
.alert.alert-info
%strong This merge request already can not be merged. Try to reload page.