summaryrefslogtreecommitdiff
path: root/app/finders
diff options
context:
space:
mode:
authorArinde Eniola <eniolaarinde1@gmail.com>2016-04-25 09:09:39 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-05-06 10:47:12 +0200
commit4eb16290e4e95c0a9bcf3d01ecc8060d91eec021 (patch)
tree6f978f35c25d33e567e57fc22beb92b5b2f8c931 /app/finders
parent3bdc57f0a710b3769381ecad7ea4098223ecff56 (diff)
downloadgitlab-ce-4eb16290e4e95c0a9bcf3d01ecc8060d91eec021.tar.gz
move frontend logic from previous MR to new MR
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/notes_finder.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb
index fa4c635f55c..ab252821b52 100644
--- a/app/finders/notes_finder.rb
+++ b/app/finders/notes_finder.rb
@@ -12,9 +12,9 @@ class NotesFinder
when "commit"
project.notes.for_commit_id(target_id).not_inline
when "issue"
- project.issues.find(target_id).notes.nonawards.inc_author
+ project.issues.find(target_id).notes.inc_author
when "merge_request"
- project.merge_requests.find(target_id).mr_and_commit_notes.nonawards.inc_author
+ project.merge_requests.find(target_id).mr_and_commit_notes.inc_author
when "snippet", "project_snippet"
project.snippets.find(target_id).notes
else