diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-06 18:18:53 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-08 14:37:46 -0500 |
| commit | a8339fe1aa95d489e00cb0b79a20557d711639ec (patch) | |
| tree | 941fafaa5709c333a06981b5068f151fa0c56eb0 /app/views/discussions | |
| parent | f112f81d3d463a81c8b5e9225d5e9bb40e82abe8 (diff) | |
| download | gitlab-ce-a8339fe1aa95d489e00cb0b79a20557d711639ec.tar.gz | |
Fix views after rebase
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |