diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-31 17:39:14 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-08 14:37:46 -0500 |
| commit | b202b42cfee6bb8cf0c142c918c545f45464a29c (patch) | |
| tree | bcdc1d30a4ec2c11fd4b388cac69a450051943e6 /app/views/discussions | |
| parent | 3d1cade13f61115b63bf6dbda5a1f194ba54b24b (diff) | |
| download | gitlab-ce-b202b42cfee6bb8cf0c142c918c545f45464a29c.tar.gz | |
Link to outdated diff in older MR version from outdated diff discussion
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index e04958817e4..f12778be305 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -34,7 +34,12 @@ - if discussion.active? = link_to 'the diff', discussion_diff_path(discussion) - else - an outdated diff + - merge_request_diff = discussion.latest_merge_request_diff + - if merge_request_diff + = link_to diffs_namespace_project_merge_request_path(discussion.project.namespace, discussion.project, discussion.noteable, diff_id: merge_request_diff, anchor: discussion.line_code) do + an outdated diff + - else + an outdated diff = time_ago_with_tooltip(discussion.created_at, placement: "bottom", html_class: "note-created-ago") = render "discussions/headline", discussion: discussion |