From a8339fe1aa95d489e00cb0b79a20557d711639ec Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 6 Apr 2017 18:18:53 -0500 Subject: Fix views after rebase --- app/views/discussions/_discussion.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views') diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 0ee27b6ff20..f48dc575661 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -29,7 +29,7 @@ = link_to commit.short_id, url, class: 'monospace' - else a deleted commit - - else + - elsif discussion.diff_discussion? = conditional_link_to url.present?, url do - if discussion.active? the diff -- cgit v1.2.1