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

States events fixed

Browse source
This commit is contained in:
Andrew8xx8 2013-02-18 16:49:56 +04:00
parent 231d9e0426
commit ff94f29be5
7 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/views/merge_requests/show/_mr_box.html.haml
View file

@ -23,12 +23,12 @@
- if @merge_request.closed?
.ui-box-bottom
- if @merge_request.merged?
%span
Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
- elsif @merge_request.closed_event
%span
Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
%span
Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
- if @merge_request.merged?
.ui-box-bottom
%span
Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.

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

@ -17,7 +17,8 @@
%li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
%li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff)
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close merge request"
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
= p project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close })
= link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
%i.icon-edit