diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-14 18:07:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-14 18:07:57 +0000 |
| commit | 14695798fb7cc3e51c19d96df4a4dc5b14c2c6cf (patch) | |
| tree | 7cdebbc538aedb68389e8d43bb388199f2dd7874 | |
| parent | e777710a10b808a21e7b52964e7dd3a3924b16f1 (diff) | |
| parent | 5c6e768a9d10be7352222438be0f57aecd449cb1 (diff) | |
| download | gitlab-ce-14695798fb7cc3e51c19d96df4a4dc5b14c2c6cf.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 5 | ||||
| -rw-r--r-- | 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 55e834947d1..eae3590a189 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 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)}"); |