summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-13 21:21:57 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-01-13 21:21:57 -0500
commit481431b75d0ec81e5077f2dc7622910ad44e9145 (patch)
tree100773472b9c63ef65c86f26831106d6b7b34cb3
parent0e344aa2299d2f6911282de5d4808c70d658d372 (diff)
downloadgitlab-ce-481431b75d0ec81e5077f2dc7622910ad44e9145.tar.gz
Fix cross-project reference clipboard text
See https://gitlab.com/gitlab-org/gitlab-ce/issues/4183
-rw-r--r--app/assets/stylesheets/pages/issuable.scss6
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml7
2 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index d4b44004f4f..1c17d9e94ad 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -95,7 +95,7 @@
.cross-project-reference {
color: $gl-link-color;
-
+
span {
white-space: nowrap;
width: 85%;
@@ -105,6 +105,10 @@
text-overflow: ellipsis;
}
+ cite {
+ font-style: normal;
+ }
+
button {
float: right;
}
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 2299112bec7..9f4a7098ea2 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)}");