diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-06 17:13:28 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-08 14:37:46 -0500 |
| commit | 50eae640dbbfa42a42e8b6966bd739cfda3adabc (patch) | |
| tree | 1471ce67569d038e64a7e6f616d0d24be945aab9 /app/views/discussions | |
| parent | f47b737456f848784fddb5958c3fa781d2ede2f1 (diff) | |
| download | gitlab-ce-50eae640dbbfa42a42e8b6966bd739cfda3adabc.tar.gz | |
Fix specs and make tweaks
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 6f74948f498..0ee27b6ff20 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -26,14 +26,15 @@ - commit = discussion.noteable - if commit commit - = link_to commit.short_id, discussion_diff_path(discussion), class: 'monospace' + = link_to commit.short_id, url, class: 'monospace' - else a deleted commit - else - - unless discussion.active? - a now outdated portion of = conditional_link_to url.present?, url do - the diff + - if discussion.active? + the diff + - else + an outdated diff = time_ago_with_tooltip(discussion.created_at, placement: "bottom", html_class: "note-created-ago") = render "discussions/headline", discussion: discussion |