summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-03-07 23:45:50 +0100
committerBob Van Landuyt <bob@gitlab.com>2017-03-13 08:27:51 +0100
commitdcec4c531f3268a7ae681bb7cc5d5b7217b4b33a (patch)
tree81fb92469d04916f581b417dc5606996aad05ed4 /app
parentb9aa6c3583578d3ddd971139b91fb6226a49102a (diff)
downloadgitlab-ce-dcec4c531f3268a7ae681bb7cc5d5b7217b4b33a.tar.gz
Finding discussions in NotesFinder is no longer required.
Since the MergeRequest is now a required param for resolving discussions
Diffstat (limited to 'app')
-rw-r--r--app/finders/notes_finder.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb
index 98c66dfa021..6630c6384f2 100644
--- a/app/finders/notes_finder.rb
+++ b/app/finders/notes_finder.rb
@@ -11,7 +11,6 @@ class NotesFinder
# target_type: string
# target_id: integer
# last_fetched_at: time
- # discussion_id: string
# search: string
#
def initialize(project, current_user, params = {})
@@ -23,7 +22,6 @@ class NotesFinder
def execute
@notes = since_fetch_at(@params[:last_fetched_at]) if @params[:last_fetched_at]
- @notes = for_discussion(@params[:discussion_id]) if @params[:discussion_id]
@notes
end
@@ -102,8 +100,4 @@ class NotesFinder
@notes.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP).fresh
end
-
- def for_discussion(discussion_id)
- @notes.where(discussion_id: discussion_id)
- end
end