diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-16 13:30:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-16 13:30:15 +0000 |
| commit | e07c9c1ee1c5eb2d4219023b85d1960b169ec581 (patch) | |
| tree | f2a3b1ad39fc527d733a243f1574f795f2407122 /app/views | |
| parent | 78be4fb21c51cb147f7c390f6a55cb265207d95f (diff) | |
| parent | f49ac5c8d3c3fbe9a75a31ace0cf7a0ed698ded2 (diff) | |
| download | gitlab-ce-e07c9c1ee1c5eb2d4219023b85d1960b169ec581.tar.gz | |
Merge branch 'rs-clipboard-fixes' into 'master'
Fix clipboard buttons on MR instructions and Commit#show
See merge request !2108
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_how_to_merge.html.haml | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 634924db247..cd40bfafcc2 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -20,8 +20,8 @@ %p %span.light Commit - = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace", data: { clipboard_text: @commit.id } - = clipboard_button + = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace" + = clipboard_button(clipboard_text: @commit.id) .commit-info-row %span.light Authored by %strong 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) |