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

reverting _mr_title.html.haml

Browse source
This commit is contained in:
Jacob Schatz 2016-01-12 14:38:37 -05:00
parent 7abfe14ee1
commit aaf184bfa6
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/views/projects/merge_requests/show/_mr_title.html.haml
View file

@ -1,12 +1,6 @@
.detail-page-header .detail-page-header
- if @merge_request.merged? .status-box{ class: status_box_class(@merge_request) }
.status-box{ class: "status-box-merged" } = @merge_request.state_human_name
Merged
- else
.status-box{ class: "status-box-closed #{merge_request_button_visibility(@merge_request, false)}"}
Closed
.status-box{ class: "status-box-open #{merge_request_button_visibility(@merge_request, true)}"}
Open
%span.identifier %span.identifier
Merge Request ##{@merge_request.iid} Merge Request ##{@merge_request.iid}
%span.creator %span.creator
@ -21,11 +15,11 @@
= time_ago_with_tooltip(@merge_request.updated_at, placement: 'bottom') = time_ago_with_tooltip(@merge_request.updated_at, placement: 'bottom')
.issue-btn-group.pull-right .issue-btn-group.pull-right
- if can?(current_user, :update_merge_request, @merge_request) && !@merge_request.merged? - if can?(current_user, :update_merge_request, @merge_request)
- if @merge_request.open?
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }, format: 'json'), data: {no_turbolink: true}, method: :put, class: "btn btn-nr btn-grouped btn-reopen reopen-mr-link #{merge_request_button_visibility(@merge_request, false)}", title: 'Reopen merge request' = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: 'btn btn-nr btn-grouped btn-close', title: 'Close merge request'
= link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }, format: 'json'), data: {no_turbolink: true}, method: :put, class: "btn btn-nr btn-grouped btn-close #{merge_request_button_visibility(@merge_request, true)}", title: 'Close merge request' = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-nr btn-grouped issuable-edit', id: 'edit_merge_request' do
%i.fa.fa-pencil-square-o
= link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "btn btn-nr btn-grouped issuable-edit #{merge_request_button_visibility(@merge_request, true)}", id: 'edit_merge_request' do Edit
%i.fa.fa-pencil-square-o - if @merge_request.closed?
Edit = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'btn btn-nr btn-grouped btn-reopen reopen-mr-link', title: 'Reopen merge request'