diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-10-23 15:44:39 +0200 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-23 15:44:39 +0200 |
| commit | 8010872579dbb28b8f075059c3267356ca793b99 (patch) | |
| tree | b81ef33127e2efd7a6f0b83593fa051c52623fd2 | |
| parent | 187625831f7b501ff6689707d1859b9c7ec4f5e0 (diff) | |
| download | gitlab-ce-8010872579dbb28b8f075059c3267356ca793b99.tar.gz | |
Add clipboard buttons to each step of "How to merge"
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 9 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_how_to_merge.html.haml | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index a1a5208c59c..f0b3667acca 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -205,6 +205,15 @@ #modal_merge_info .modal-dialog { width: 600px; + + .btn-clipboard { + @extend .pull-right; + + margin-right: 18px; + margin-top: 5px; + position: absolute; + right: 0; + } } .mr-source-target { diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml index f18cf96c17d..98f0357ce4e 100644 --- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml +++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml @@ -3,11 +3,12 @@ .modal-content .modal-header %a.close{href: "#", "data-dismiss" => "modal"} × - %h3 Check out, review and merge locally + %h3 Check out, review, and merge locally .modal-body %p - %strong Step 1. + %strong Step 1. Fetch and check out the branch for this merge request + = clipboard_button %pre.dark - if @merge_request.for_fork? :preserve @@ -24,6 +25,7 @@ %p %strong Step 3. Merge the branch and fix any conflicts that come up + = clipboard_button %pre.dark - if @merge_request.for_fork? :preserve @@ -36,6 +38,7 @@ %p %strong Step 4. Push the result of the merge to GitLab + = clipboard_button %pre.dark :preserve git push origin #{h @merge_request.target_branch} |