summaryrefslogtreecommitdiff
path: root/app/models/concerns/noteable.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-03-31 17:39:14 -0600
committerDouwe Maan <douwe@selenight.nl>2017-04-08 14:37:46 -0500
commitb202b42cfee6bb8cf0c142c918c545f45464a29c (patch)
treebcdc1d30a4ec2c11fd4b388cac69a450051943e6 /app/models/concerns/noteable.rb
parent3d1cade13f61115b63bf6dbda5a1f194ba54b24b (diff)
downloadgitlab-ce-b202b42cfee6bb8cf0c142c918c545f45464a29c.tar.gz
Link to outdated diff in older MR version from outdated diff discussion
Diffstat (limited to 'app/models/concerns/noteable.rb')
-rw-r--r--app/models/concerns/noteable.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb
index 772ff6a6d2f..dd1e6630642 100644
--- a/app/models/concerns/noteable.rb
+++ b/app/models/concerns/noteable.rb
@@ -36,10 +36,10 @@ module Noteable
.discussions(self)
end
- def grouped_diff_discussions
+ def grouped_diff_discussions(*args)
# Doesn't use `discussion_notes`, because this may include commit diff notes
# besides MR diff notes, that we do no want to display on the MR Changes tab.
- notes.inc_relations_for_view.grouped_diff_discussions
+ notes.inc_relations_for_view.grouped_diff_discussions(*args)
end
def resolvable_discussions