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/helpers/notes_helper.rb | |
| parent | f47b737456f848784fddb5958c3fa781d2ede2f1 (diff) | |
| download | gitlab-ce-50eae640dbbfa42a42e8b6966bd739cfda3adabc.tar.gz | |
Fix specs and make tweaks
Diffstat (limited to 'app/helpers/notes_helper.rb')
| -rw-r--r-- | app/helpers/notes_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index b244ae4fcbf..6f4ba79b80b 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -68,6 +68,8 @@ module NotesHelper elsif merge_request_diff = discussion.latest_merge_request_diff diff_id = merge_request_diff.id else + # If the discussion is not active, and we cannot find the latest + # merge request diff for this discussion, we return no path at all. return end |