Merge remote-tracking branch 'upstream/master' into test-pg-mysql

* upstream/master: (90 commits)
  Fixed notebooklab code including file paths
  [BB Importer] Save the error trace and the whole raw document
  Statisfy Robertcop and Seancop
  Update documents according to:
  Update licenses.csv via:
  Update templates via:
  Add foreign key on trigger requests
  Added CHANGELOG
  Added tests and fixed a typo
  Fix typo on the class merge-when-pipeline_succeeds
  Axil's review
  remove unnecessary line
  typo
  fix typo
  fix links
  Remove an unused `cared` scope from Issue and MergeRequest
  Remove an unused `Issue.open_for` scope
  add topic: authentication
  Fix edit button on blame page without repo perms
  Don't show 'Copy content' button on text files that are not rendered as text
  ...

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