diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-03 14:02:34 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-03 14:02:34 +0300 |
| commit | ac04665a8c35a9c96fe4fc6fe4391aa8ef703fd0 (patch) | |
| tree | bc8f8a3e36b733c2265c9fbf1b0c52f1af49e822 /app/views/projects/merge_requests | |
| parent | 03d1ee17eb12feef410eb85667c74dfcf32bf75a (diff) | |
| parent | ed1c22568a9363161d20a1c38147d0ef0f019c2b (diff) | |
Merge branch 'show-cross-project-ref' into 'master'
Show cross project ref
Fixes #1661
See merge request !1292
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
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)} |