summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/show/_how_to_merge.html.haml
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-12-15 16:11:01 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-12-15 16:11:01 -0500
commitf49ac5c8d3c3fbe9a75a31ace0cf7a0ed698ded2 (patch)
tree1cd578006639861a0596c6025681f0dcbe70cfe7 /app/views/projects/merge_requests/show/_how_to_merge.html.haml
parenta5a9cd304c10fe012df433e14053b973f7cfc749 (diff)
downloadgitlab-ce-f49ac5c8d3c3fbe9a75a31ace0cf7a0ed698ded2.tar.gz
Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixes
Diffstat (limited to 'app/views/projects/merge_requests/show/_how_to_merge.html.haml')
-rw-r--r--app/views/projects/merge_requests/show/_how_to_merge.html.haml12
1 files changed, 6 insertions, 6 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 98f0357ce4e..877cc3d744b 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,8 +8,8 @@
%p
%strong Step 1.
Fetch and check out the branch for this merge request
- = clipboard_button
- %pre.dark
+ = clipboard_button(clipboard_target: 'pre#merge-info-1')
+ %pre.dark#merge-info-1
- if @merge_request.for_fork?
:preserve
git fetch #{h @merge_request.source_project.http_url_to_repo} #{h @merge_request.source_branch}
@@ -25,8 +25,8 @@
%p
%strong Step 3.
Merge the branch and fix any conflicts that come up
- = clipboard_button
- %pre.dark
+ = clipboard_button(clipboard_target: 'pre#merge-info-3')
+ %pre.dark#merge-info-3
- if @merge_request.for_fork?
:preserve
git checkout #{h @merge_request.target_branch}
@@ -38,8 +38,8 @@
%p
%strong Step 4.
Push the result of the merge to GitLab
- = clipboard_button
- %pre.dark
+ = clipboard_button(clipboard_target: 'pre#merge-info-4')
+ %pre.dark#merge-info-4
:preserve
git push origin #{h @merge_request.target_branch}
- unless @merge_request.can_be_merged_by?(current_user)