summaryrefslogtreecommitdiff
path: root/app/helpers/diff_helper.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-04-09 22:27:45 -0500
committerDouwe Maan <douwe@selenight.nl>2017-04-09 22:27:45 -0500
commit48a0e9f6aece36e83e3ffde5be42f964b5362221 (patch)
treef61b44e324bc3ced058c5cf11dc114f3ec8e778d /app/helpers/diff_helper.rb
parent1817f877e19628417dd8209f070386b111de59c4 (diff)
downloadgitlab-ce-48a0e9f6aece36e83e3ffde5be42f964b5362221.tar.gz
Fix specs
Diffstat (limited to 'app/helpers/diff_helper.rb')
-rw-r--r--app/helpers/diff_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb
index 5e0886cc599..dc144906548 100644
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -62,6 +62,8 @@ module DiffHelper
end
def parallel_diff_discussions(left, right, diff_file)
+ return unless @grouped_diff_discussions
+
discussions_left = discussions_right = nil
if left && (left.unchanged? || left.removed?)