diff options
author | Connor Shea <connor.james.shea@gmail.com> | 2016-06-17 11:27:18 -0600 |
---|---|---|
committer | Connor Shea <connor.james.shea@gmail.com> | 2016-06-17 11:27:18 -0600 |
commit | 12b39524779e36b2e52e0b64c1d85186355e9415 (patch) | |
tree | 4b5dc1671026359ec423c652114866f24916e59a /app/views/projects | |
parent | 1ca1ebc09bda279dcbacfcfaf39e0410f94ca985 (diff) | |
download | gitlab-ce-12b39524779e36b2e52e0b64c1d85186355e9415.tar.gz |
Fix clibpoard buttons on "Check out branch" modal.clipboard-buttons-fix
Also document the clipboard_button_with_class method.
Fixes #18794.
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/merge_requests/show/_how_to_merge.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
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 0dbd159298e..b3bea900d42 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 @@ -8,7 +8,7 @@ %p %strong Step 1. Fetch and check out the branch for this merge request - = clipboard_button(clipboard_target: 'pre#merge-info-1') + = clipboard_button_with_class({clipboard_target: "pre#merge-info-1"}, css_class: "btn-clipboard") %pre.dark#merge-info-1 - if @merge_request.for_fork? :preserve @@ -25,7 +25,7 @@ %p %strong Step 3. Merge the branch and fix any conflicts that come up - = clipboard_button(clipboard_target: 'pre#merge-info-3') + = clipboard_button_with_class({clipboard_target: "pre#merge-info-3"}, css_class: "btn-clipboard") %pre.dark#merge-info-3 - if @merge_request.for_fork? :preserve @@ -38,7 +38,7 @@ %p %strong Step 4. Push the result of the merge to GitLab - = clipboard_button(clipboard_target: 'pre#merge-info-4') + = clipboard_button_with_class({clipboard_target: "pre#merge-info-4"}, css_class: "btn-clipboard") %pre.dark#merge-info-4 :preserve git push origin #{h @merge_request.target_branch} |