diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-21 15:38:33 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-23 16:27:30 -0500 |
| commit | ab91f76e8b275d0fc1d78b38b95d4b2cd8e73bdb (patch) | |
| tree | e22910b5a3fc8dee98c5d674ee030b46421a4727 /app/views/discussions | |
| parent | 52527be4387cb978402a330f2e4de96e586a62db (diff) | |
| download | gitlab-ce-ab91f76e8b275d0fc1d78b38b95d4b2cd8e73bdb.tar.gz | |
Add system note with link to diff comparison when MR discussion becomes outdated
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 74992e439f3..578e751ab47 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -32,10 +32,9 @@ - elsif discussion.diff_discussion? on = conditional_link_to url.present?, url do - - if discussion.active? - the diff - - else - an outdated diff + - unless discussion.active? + an old version of + the diff = time_ago_with_tooltip(discussion.created_at, placement: "bottom", html_class: "note-created-ago") = render "discussions/headline", discussion: discussion |