diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-04 01:32:00 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-04 01:32:00 +0300 |
| commit | 538e66d71c0f7125cc62ea51480668ba8b342544 (patch) | |
| tree | d27f667dbe404ce406e2ac6b3a901b87ff93da47 /app/helpers/notes_helper.rb | |
| parent | 3ccb27c0c79ef92585a901de32339948319cf068 (diff) | |
| parent | 8890376f0f72f713a7530bd7989e71442c69dc91 (diff) | |
Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
# app/models/discussion.rb
# db/schema.rb
Diffstat (limited to 'app/helpers/notes_helper.rb')
| -rw-r--r-- | app/helpers/notes_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index 3761855efc7..0bff88f1dd2 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -90,6 +90,10 @@ module NotesHelper project.team.max_member_access_for_user_ids(user_ids) end + def preload_noteable_for_regular_notes(notes) + ActiveRecord::Associations::Preloader.new.preload(notes.select { |note| !note.for_commit? }, :noteable) + end + def note_max_access_for_user(note) note.project.team.human_max_access(note.author_id) end |