diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 06:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 06:09:05 +0300 |
| commit | 07d0374b204881f2bd64ed897e4bbab19f180cc9 (patch) | |
| tree | ed7837a31c0edae5e8ec876626b0bf3ecb3db68c /app/controllers/concerns | |
| parent | 2ed3b0abccc8de391f1a9de2bc5785d3e0f5b018 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/notes_actions.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index c4abaacd573..ca43bf42580 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -137,7 +137,7 @@ module IssuableActions end notes = prepare_notes_for_rendering(notes) - notes = notes.select { |n| n.visible_for?(current_user) } + notes = notes.select { |n| n.readable_by?(current_user) } discussions = Discussion.build_collection(notes, issuable) diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index 3d599d9e7f9..7dd2f6e5706 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -29,7 +29,7 @@ module NotesActions end notes = prepare_notes_for_rendering(notes) - notes = notes.select { |n| n.visible_for?(current_user) } + notes = notes.select { |n| n.readable_by?(current_user) } notes_json[:notes] = if use_note_serializer? |