Commit 9049cdff authored by Douwe Maan's avatar Douwe Maan

Add "Check out branch" button to the MR page.

parent a71bed53
...@@ -43,6 +43,9 @@ v 7.14.0 (unreleased) ...@@ -43,6 +43,9 @@ v 7.14.0 (unreleased)
- Fetch code from forks to refs/merge-requests/:id/head when merge request created - Fetch code from forks to refs/merge-requests/:id/head when merge request created
- Remove satellites - Remove satellites
- Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg) - Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
- Improve MR merge widget text and UI consistency.
- Improve text in MR "How To Merge" modal.
- Add "Check out branch" button to the MR page.
v 7.13.3 v 7.13.3
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed. - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
......
...@@ -179,3 +179,7 @@ ...@@ -179,3 +179,7 @@
.merge-request-form .select2-container { .merge-request-form .select2-container {
width: 250px !important; width: 250px !important;
} }
.mr-source-target {
line-height: 31px;
}
...@@ -5,9 +5,15 @@ ...@@ -5,9 +5,15 @@
%hr %hr
= render "projects/merge_requests/show/mr_box" = render "projects/merge_requests/show/mr_box"
%hr %hr
.append-bottom-20 .append-bottom-20.mr-source-target
- if @merge_request.open? - if @merge_request.open?
.btn-group.btn-group-sm.pull-right .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} } %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
= icon('download') = icon('download')
Download as Download as
...@@ -17,7 +23,7 @@ ...@@ -17,7 +23,7 @@
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff) %li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
.light .light
%div %div
%span From %span Request to merge
%span.label-branch #{source_branch_with_namespace(@merge_request)} %span.label-branch #{source_branch_with_namespace(@merge_request)}
%span into %span into
%span.label-branch #{@merge_request.target_branch} %span.label-branch #{@merge_request.target_branch}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment