From 3eb5ceba3a87ab5931629c85cf3f9758757acdf9 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Thu, 14 Jan 2016 18:07:57 +0000
Subject: [PATCH] Merge branch 'rs-fix-cross-reference' into 'master'

Fix cross-project reference clipboard text

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2339

See merge request !2420
---
 app/assets/stylesheets/pages/issuable.scss   | 5 +++++
 app/views/shared/issuable/_sidebar.html.haml | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index d4b44004f4..60a008a353 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -105,8 +105,13 @@
       text-overflow: ellipsis;
     }
 
+    cite {
+      font-style: normal;
+    }
+
     button {
       float: right;
+      padding: 3px 5px;
     }
   }
 
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 2299112bec..9f4a7098ea 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -69,15 +69,16 @@
             You're not receiving notifications from this thread.
           .subscribed{class: ( 'hidden' unless subscribed )}
             You're receiving notifications because you're subscribed to this thread.
+
     - project_ref = cross_project_reference(@project, issuable)
     .block
       .title
       .cross-project-reference
-        %span#cross-project-reference
+        %span
           Reference:
-          %a{href: '#', title:project_ref}
+          %cite{title: project_ref}
             = project_ref
-        = clipboard_button(clipboard_target: 'span#cross-project-reference')
+        = clipboard_button(clipboard_text: project_ref)
 
   :javascript
     new Subscription("#{toggle_subscription_path(issuable)}");