102 lines
4.7 KiB
Plaintext
102 lines
4.7 KiB
Plaintext
.merge-request
|
|
= render "projects/merge_requests/show/mr_title"
|
|
%hr
|
|
.row
|
|
.col-sm-9
|
|
= render "projects/merge_requests/show/how_to_merge"
|
|
= render "projects/merge_requests/show/mr_box"
|
|
%hr
|
|
.append-bottom-20
|
|
%p.slead
|
|
%span From
|
|
- if @merge_request.for_fork?
|
|
%strong.label-branch<
|
|
- if @merge_request.source_project
|
|
= link_to @merge_request.source_project_namespace, project_path(@merge_request.source_project)
|
|
- else
|
|
\ #{@merge_request.source_project_namespace}
|
|
\:#{@merge_request.source_branch}
|
|
%span into
|
|
%strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
|
|
- else
|
|
%strong.label-branch #{@merge_request.source_branch}
|
|
%span into
|
|
%strong.label-branch #{@merge_request.target_branch}
|
|
= render "projects/merge_requests/show/state_widget"
|
|
= render "projects/merge_requests/show/commits"
|
|
= render "projects/merge_requests/show/participants"
|
|
|
|
.col-sm-3
|
|
.issue-btn-group
|
|
- if can?(current_user, :modify_merge_request, @merge_request)
|
|
- if @merge_request.open?
|
|
.btn-group-justified.append-bottom-20
|
|
.btn-group
|
|
%a.btn.dropdown-toggle{ data: {toggle: :dropdown} }
|
|
%i.fa.fa-download
|
|
Download as
|
|
%span.caret
|
|
%ul.dropdown-menu
|
|
%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: { state_event: :close }), method: :put, class: "btn btn-block btn-close", title: "Close merge request"
|
|
= link_to edit_project_merge_request_path(@project, @merge_request), class: "btn btn-block issuable-edit", id: "edit_merge_request" do
|
|
%i.fa.fa-pencil-square-o
|
|
Edit
|
|
- if @merge_request.closed?
|
|
= link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-block btn-reopen reopen-mr-link", title: "Close merge request"
|
|
.clearfix
|
|
%span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
|
|
= cross_project_reference(@project, @merge_request)
|
|
%hr
|
|
.votes-holder.hidden-sm.hidden-xs
|
|
%h6 Votes
|
|
#votes= render 'votes/votes_block', votable: @merge_request
|
|
%hr
|
|
.context
|
|
%cite.cgray
|
|
= render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
|
|
|
|
- if @commits.present?
|
|
%ul.nav.nav-tabs.merge-request-tabs
|
|
%li.notes-tab{data: {action: 'notes'}}
|
|
= link_to project_merge_request_path(@project, @merge_request) do
|
|
%i.fa.fa-comment
|
|
Discussion
|
|
%span.badge= @merge_request.mr_and_commit_notes.count
|
|
%li.diffs-tab{data: {action: 'diffs'}}
|
|
= link_to diffs_project_merge_request_path(@project, @merge_request) do
|
|
%i.fa.fa-list-alt
|
|
Changes
|
|
%span.badge= @merge_request.diffs.size
|
|
|
|
- content_for :note_actions do
|
|
- if can?(current_user, :modify_merge_request, @merge_request)
|
|
- if @merge_request.open?
|
|
= link_to 'Close', project_merge_request_path(@project, @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"
|
|
- if @merge_request.closed?
|
|
= link_to 'Reopen', project_merge_request_path(@project, @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"
|
|
|
|
.diffs.tab-content
|
|
- if current_page?(action: 'diffs')
|
|
= render "projects/merge_requests/show/diffs"
|
|
.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
|
|
.row
|
|
.col-sm-9
|
|
= render "projects/notes/notes_with_form"
|
|
.mr-loading-status
|
|
= spinner
|
|
|
|
|
|
:javascript
|
|
var merge_request;
|
|
|
|
merge_request = new MergeRequest({
|
|
url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
|
|
check_enable: #{@merge_request.unchecked? ? "true" : "false"},
|
|
url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
|
|
ci_enable: #{@project.ci_service ? "true" : "false"},
|
|
current_status: "#{@merge_request.merge_status_name}",
|
|
action: "#{controller.action_name}"
|
|
});
|