diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 21:05:53 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-18 21:05:53 +0300 |
| commit | bb883387f9e4d5564b455cce7d412f730664a2f5 (patch) | |
| tree | 02f972c30f9a01d605e2c88a22b2c7172694e475 /app/finders/notes_finder.rb | |
| parent | 7a4e7ad04e1fc96953d9159e8e1a2208990d34f7 (diff) | |
| parent | b7d83acf5b03e08dc9e387e1abb83c5e3c80444c (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/models/note.rb
# db/schema.rb
# spec/models/note_spec.rb
Diffstat (limited to 'app/finders/notes_finder.rb')
| -rw-r--r-- | app/finders/notes_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb index ab252821b52..ee14ac60fb4 100644 --- a/app/finders/notes_finder.rb +++ b/app/finders/notes_finder.rb @@ -10,7 +10,7 @@ class NotesFinder notes = case target_type when "commit" - project.notes.for_commit_id(target_id).not_inline + project.notes.for_commit_id(target_id).non_diff_notes when "issue" project.issues.find(target_id).notes.inc_author when "merge_request" |