debian-mirror-gitlab/app/views/projects/merge_requests/_show.html.haml

73 lines
2.9 KiB
Text
Raw Normal View History

2015-09-11 14:41:01 +05:30
- page_title "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
2015-09-25 12:07:36 +05:30
= render "header_title"
- if params[:view] == 'parallel'
- fluid_layout true
2015-04-26 12:48:37 +05:30
.merge-request{'data-url' => merge_request_path(@merge_request)}
2015-09-11 14:41:01 +05:30
.merge-request-details.issuable-details
2015-04-26 12:48:37 +05:30
= render "projects/merge_requests/show/mr_title"
= render "projects/merge_requests/show/mr_box"
2015-09-25 12:07:36 +05:30
.append-bottom-20.mr-source-target.prepend-top-default
2015-09-11 14:41:01 +05:30
- if @merge_request.open?
.pull-right
- if @merge_request.source_branch_exists?
= link_to "#modal_merge_info", class: "btn btn-sm", "data-toggle" => "modal" do
= icon('cloud-download fw')
Check out branch
%span.dropdown
%a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
= icon('download')
Download as
%span.caret
%ul.dropdown-menu
%li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
.light
%span Request to merge
%span.label-branch #{source_branch_with_namespace(@merge_request)}
%span into
%span.label-branch #{@merge_request.target_branch}
2015-04-26 12:48:37 +05:30
= render "projects/merge_requests/show/how_to_merge"
2015-09-11 14:41:01 +05:30
= render "projects/merge_requests/widget/show.html.haml"
- if @merge_request.open? && @merge_request.can_be_merged?
.light
You can also accept this merge request manually using the
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
2014-09-02 18:07:02 +05:30
- if @commits.present?
2015-09-25 12:07:36 +05:30
%ul.merge-request-tabs
2015-09-11 14:41:01 +05:30
%li.notes-tab
= link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#notes', action: 'notes', toggle: 'tab'} do
2014-09-02 18:07:02 +05:30
Discussion
2015-04-26 12:48:37 +05:30
%span.badge= @merge_request.mr_and_commit_notes.user.count
2015-09-11 14:41:01 +05:30
%li.commits-tab
= link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#commits', action: 'commits', toggle: 'tab'} do
2015-04-26 12:48:37 +05:30
Commits
%span.badge= @commits.size
2015-09-11 14:41:01 +05:30
%li.diffs-tab
= link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#diffs', action: 'diffs', toggle: 'tab'} do
2014-09-02 18:07:02 +05:30
Changes
%span.badge= @merge_request.diffs.size
2015-09-11 14:41:01 +05:30
.tab-content
#notes.notes.tab-pane.voting_notes
= render "projects/merge_requests/discussion"
#commits.commits.tab-pane
- # This tab is always loaded via AJAX
#diffs.diffs.tab-pane
- # This tab is always loaded via AJAX
2015-04-26 12:48:37 +05:30
2014-09-02 18:07:02 +05:30
.mr-loading-status
= spinner
:javascript
var merge_request;
merge_request = new MergeRequest({
action: "#{controller.action_name}"
});