summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-08 21:17:43 +0200
committerDouwe Maan <douwe@gitlab.com>2015-08-08 21:27:29 +0200
commit9049cdff5a52ab12e7f52a6a35360a1d9e9423e3 (patch)
tree22686263b540cf7b0288dd6810c07226d50a3ed1 /app/views/projects/merge_requests
parenta71bed53e0aceb10b8e97d490a0d0486a8d47e72 (diff)
downloadgitlab-ce-9049cdff5a52ab12e7f52a6a35360a1d9e9423e3.tar.gz
Add "Check out branch" button to the MR page.
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r--app/views/projects/merge_requests/_show.html.haml26
1 files changed, 16 insertions, 10 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 2662e3aff6b..cd53856c4a6 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -5,19 +5,25 @@
%hr
= render "projects/merge_requests/show/mr_box"
%hr
- .append-bottom-20
+ .append-bottom-20.mr-source-target
- if @merge_request.open?
- .btn-group.btn-group-sm.pull-right
- %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)
+ .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
%div
- %span From
+ %span Request to merge
%span.label-branch #{source_branch_with_namespace(@merge_request)}
%span into
%span.label-branch #{@merge_request.target_branch}