diff options
Diffstat (limited to 'app/policies/note_policy.rb')
| -rw-r--r-- | app/policies/note_policy.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/policies/note_policy.rb b/app/policies/note_policy.rb index 2f6c579906c..6659bf062c4 100644 --- a/app/policies/note_policy.rb +++ b/app/policies/note_policy.rb @@ -3,7 +3,6 @@ class NotePolicy < BasePolicy delegate { @subject.noteable if @subject.noteable.lockable? } condition(:is_author) { @user && @subject.author == @user } - condition(:for_merge_request, scope: :subject) { @subject.for_merge_request? } condition(:is_noteable_author) { @user && @subject.noteable.author_id == @user.id } condition(:editable, scope: :subject) { @subject.editable? } @@ -16,7 +15,7 @@ class NotePolicy < BasePolicy enable :resolve_note end - rule { for_merge_request & is_noteable_author }.policy do + rule { is_noteable_author }.policy do enable :resolve_note end end |