diff options
author | Robert Speicher <robert@gitlab.com> | 2015-12-09 00:22:17 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-12-09 00:22:17 +0300 |
commit | e616739e2fae12e5358d2cea40089a51468d9b4a (patch) | |
tree | 7272d0cb9ca715584bafd92338d484a1eb2b8ff5 /app | |
parent | d1ee3b7bad4561947709f9e4b2e90b310fc1788e (diff) | |
parent | 813c9b2aeb9e5d44c99f02a2373ee0e007d0e87d (diff) |
Merge branch 'rs-clipboard-selector' into 'master'
Make cross-project reference's clipboard target less naive
See !2023
See merge request !2024
Diffstat (limited to 'app')
-rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 21eee70b424..f2011542ca7 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -17,7 +17,7 @@ .input-group.cross-project-reference %span#cross-project-reference.slead.has_tooltip{title: 'Cross-project reference'} = cross_project_reference(@project, @issue) - = clipboard_button(clipboard_target: '#cross-project-reference') + = clipboard_button(clipboard_target: 'span#cross-project-reference') .row %section.col-md-9 diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 3d7bd78dce3..d64b19ae91a 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -17,7 +17,7 @@ .input-group.cross-project-reference %span#cross-project-reference.slead.has_tooltip{title: 'Cross-project reference'} = cross_project_reference(@project, @merge_request) - = clipboard_button(clipboard_target: '#cross-project-reference') + = clipboard_button(clipboard_target: 'span#cross-project-reference') .row %section.col-md-9 |