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

Merge Button v1 complete

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-30 20:49:34 +03:00
parent 464cd59dff
commit 90748cf724
6 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,8 @@
Closed by #{@merge_request.closed_event.author_name}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
- if @merge_request.open? && @commits.any?
- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
- if @merge_request.can_be_merged?
.ui-box.padded
%p