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
This commit is contained in:
Robert Speicher 2016-01-14 18:07:57 +00:00
commit 14695798fb
2 changed files with 9 additions and 3 deletions

View File

@ -105,8 +105,13 @@
text-overflow: ellipsis;
}
cite {
font-style: normal;
}
button {
float: right;
padding: 3px 5px;
}
}

View File

@ -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)}");