2014-12-25 12:32:49 +00:00
|
|
|
- content_for :note_actions do
|
2015-06-26 13:55:56 +00:00
|
|
|
- if can?(current_user, :update_merge_request, @merge_request)
|
2014-12-25 12:32:49 +00:00
|
|
|
- if @merge_request.open?
|
2015-02-26 03:34:16 +00:00
|
|
|
= link_to 'Close', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request"
|
2014-12-25 12:32:49 +00:00
|
|
|
- if @merge_request.closed?
|
2015-02-26 03:34:16 +00:00
|
|
|
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
|
2014-12-25 12:32:49 +00:00
|
|
|
|
2015-04-26 22:43:02 +00:00
|
|
|
= render 'shared/show_aside'
|
|
|
|
|
|
2014-12-25 12:32:49 +00:00
|
|
|
.row
|
2015-02-22 06:01:27 +00:00
|
|
|
%section.col-md-9
|
2015-03-20 19:45:45 +00:00
|
|
|
.votes-holder.pull-right
|
|
|
|
|
#votes= render 'votes/votes_block', votable: @merge_request
|
2014-12-25 12:32:49 +00:00
|
|
|
= render "projects/merge_requests/show/participants"
|
|
|
|
|
= render "projects/notes/notes_with_form"
|
2015-02-22 06:01:27 +00:00
|
|
|
%aside.col-md-3
|
2015-02-18 00:14:49 +00:00
|
|
|
.issuable-affix
|
|
|
|
|
.clearfix
|
|
|
|
|
%span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
|
|
|
|
|
= cross_project_reference(@project, @merge_request)
|
|
|
|
|
%hr
|
|
|
|
|
.context
|
2015-06-25 14:04:50 +00:00
|
|
|
= render 'shared/issuable/context', issuable: @merge_request
|
2015-02-18 00:14:49 +00:00
|
|
|
|
|
|
|
|
- if @merge_request.labels.any?
|
2015-03-20 19:45:45 +00:00
|
|
|
.issuable-context-title
|
|
|
|
|
%label Labels
|
2015-02-18 00:14:49 +00:00
|
|
|
.merge-request-show-labels
|
|
|
|
|
- @merge_request.labels.each do |label|
|
2015-05-22 03:40:25 +00:00
|
|
|
= link_to_label(label)
|
