diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-20 01:08:07 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-11-20 01:08:07 +0000 |
| commit | a8e7bee3a6de05feaee2f276f6f7b35fbbd4b9e3 (patch) | |
| tree | 72cb09c66ea9dafe35c9b5bbeecaa619df350ac2 | |
| parent | b3cd7243e9668fc0e823b6f6cf9868171f3af456 (diff) | |
| parent | 2df492fd2f5bfb6f9aa9c3f800fa4a6a39bdeeb1 (diff) | |
| download | gitlab-ce-a8e7bee3a6de05feaee2f276f6f7b35fbbd4b9e3.tar.gz | |
Merge branch 'rs-mr-reference-copy' into 'master'
Add clipboard button to merge request cross-project reference
See merge request !1847
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 7e60782ff5b..cb75bd8c5ba 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -14,8 +14,10 @@ #votes= render 'votes/votes_block', votable: @merge_request = render "projects/merge_requests/show/participants" .col-md-3 - %span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'} - = cross_project_reference(@project, @merge_request) + .input-group.cross-project-reference + %span.slead.has_tooltip{title: 'Cross-project reference'} + = cross_project_reference(@project, @merge_request) + = clipboard_button .row %section.col-md-9 |