Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-04-07 01:13:28 +0300
committerDouwe Maan <douwe@selenight.nl>2017-04-08 22:37:46 +0300
commit50eae640dbbfa42a42e8b6966bd739cfda3adabc (patch)
tree1471ce67569d038e64a7e6f616d0d24be945aab9 /app/helpers/notes_helper.rb
parentf47b737456f848784fddb5958c3fa781d2ede2f1 (diff)
Fix specs and make tweaks
Diffstat (limited to 'app/helpers/notes_helper.rb')
-rw-r--r--app/helpers/notes_helper.rb2
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