diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-03 11:40:04 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-03 11:40:04 +0200 |
commit | ed1c22568a9363161d20a1c38147d0ef0f019c2b (patch) | |
tree | 8dcaa34915033032d3f3d9d2be74ba01f344cec9 /app | |
parent | ba51a1dd328c453927d390147f5fa4be3e1f6fe7 (diff) | |
download | gitlab-ce-ed1c22568a9363161d20a1c38147d0ef0f019c2b.tar.gz |
Add cross-project reference tooltip for merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/views/projects/issues/show.html.haml | 1 | ||||
-rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 685d9f96d51..01a1fabda26 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -39,6 +39,7 @@ Open .cross-project-ref + %i.fa.fa-link.has_tooltip{:"data-original-title" => 'Cross-project reference'} = cross_project_reference(@project, @issue) .creator diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 7e5a4eda508..866b236d827 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -8,6 +8,10 @@ - else Open + .cross-project-ref + %i.fa.fa-link.has_tooltip{:"data-original-title" => 'Cross-project reference'} + = cross_project_reference(@project, @merge_request) + .creator Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)} |