summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-03-31 18:20:44 -0600
committerDouwe Maan <douwe@selenight.nl>2017-04-08 14:37:46 -0500
commitf47b737456f848784fddb5958c3fa781d2ede2f1 (patch)
tree381541a0fde2b71f02e8003e80ee0caf0ac565f1
parentd65d245e06fbe45455e130e2d4ca0ca1d066a8c6 (diff)
downloadgitlab-ce-f47b737456f848784fddb5958c3fa781d2ede2f1.tar.gz
Change discussion headline to 'a now outdated portion of the diff'
-rw-r--r--app/views/discussions/_discussion.html.haml7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml
index 47739809108..6f74948f498 100644
--- a/app/views/discussions/_discussion.html.haml
+++ b/app/views/discussions/_discussion.html.haml
@@ -30,11 +30,10 @@
- else
a deleted commit
- else
+ - unless discussion.active?
+ a now outdated portion of
= conditional_link_to url.present?, url do
- - if discussion.active?
- the diff
- - else
- an outdated diff
+ the diff
= time_ago_with_tooltip(discussion.created_at, placement: "bottom", html_class: "note-created-ago")
= render "discussions/headline", discussion: discussion