From ba51a1dd328c453927d390147f5fa4be3e1f6fe7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 20 Oct 2014 12:56:01 +0300 Subject: Render cross reference in issue title Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/generic/issue_box.scss | 5 +++++ app/helpers/gitlab_markdown_helper.rb | 12 ++++++++++++ app/views/projects/issues/show.html.haml | 3 +++ 3 files changed, 20 insertions(+) diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss index 94149594e24..79fbad4b946 100644 --- a/app/assets/stylesheets/generic/issue_box.scss +++ b/app/assets/stylesheets/generic/issue_box.scss @@ -113,6 +113,11 @@ padding: 10px 15px; } + .cross-project-ref { + float: left; + padding: 10px 15px; + } + .creator { float: right; padding: 10px 15px; diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb index 7d3cb749829..800cacdc2c2 100644 --- a/app/helpers/gitlab_markdown_helper.rb +++ b/app/helpers/gitlab_markdown_helper.rb @@ -254,4 +254,16 @@ module GitlabMarkdownHelper truncated end end + + def cross_project_reference(project, entity) + path = project.path_with_namespace + + if entity.kind_of?(Issue) + [path, entity.iid].join('#') + elsif entity.kind_of?(MergeRequest) + [path, entity.iid].join('!') + else + raise 'Not supported type' + end + end end diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index aad58e48f6c..685d9f96d51 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -38,6 +38,9 @@ - else Open + .cross-project-ref + = cross_project_reference(@project, @issue) + .creator Created by #{link_to_member(@project, @issue.author)} #{issue_timestamp(@issue)} -- cgit v1.2.1 From ed1c22568a9363161d20a1c38147d0ef0f019c2b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 3 Dec 2014 11:40:04 +0200 Subject: Add cross-project reference tooltip for merge request Signed-off-by: Dmitriy Zaporozhets --- app/views/projects/issues/show.html.haml | 1 + app/views/projects/merge_requests/show/_mr_box.html.haml | 4 ++++ 2 files changed, 5 insertions(+) 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)} -- cgit v1.2.1