diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-20 01:08:07 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-19 20:08:37 -0500 |
| commit | 094bb6f8ef5cde03a5b741975a877c070259b481 (patch) | |
| tree | 4fc1c786a19b564d48b2c14e71a7a848c58022f0 | |
| parent | 48e86ec6105b879dffe30408f265b478ec21b706 (diff) | |
| download | gitlab-ce-094bb6f8ef5cde03a5b741975a877c070259b481.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 |