diff options
author | Rémy Coutable <remy@rymai.me> | 2018-03-05 11:42:15 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-03-05 11:42:15 +0000 |
commit | b02397df8c0090c16262d2e111b6d4a6d4ebd74e (patch) | |
tree | cb3103cc4437dcb956d541ddffe95f01147a3411 /app | |
parent | b3ff123530631dff0be85dc19d43567fae4a8d19 (diff) | |
parent | daeeb7f8480d747d500ea3aeddb479a29e890562 (diff) | |
download | gitlab-ce-b02397df8c0090c16262d2e111b6d4a6d4ebd74e.tar.gz |
Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' into 'master'
Resolve "Reply-by-email did not pick up /unsubscribe quick action"
Closes #43334
See merge request gitlab-org/gitlab-ce!17482
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/notes_helper.rb | 2 | ||||
-rw-r--r-- | app/services/notes/quick_actions_service.rb | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb index e86e43b5ebf..a70e73a6da9 100644 --- a/app/helpers/notes_helper.rb +++ b/app/helpers/notes_helper.rb @@ -11,7 +11,7 @@ module NotesHelper end def note_supports_quick_actions?(note) - Notes::QuickActionsService.supported?(note, current_user) + Notes::QuickActionsService.supported?(note) end def noteable_json(noteable) diff --git a/app/services/notes/quick_actions_service.rb b/app/services/notes/quick_actions_service.rb index a8d0cc15527..0a33d5f3f3d 100644 --- a/app/services/notes/quick_actions_service.rb +++ b/app/services/notes/quick_actions_service.rb @@ -9,14 +9,12 @@ module Notes UPDATE_SERVICES[note.noteable_type] end - def self.supported?(note, current_user) - noteable_update_service(note) && - current_user && - current_user.can?(:"update_#{note.to_ability_name}", note.noteable) + def self.supported?(note) + !!noteable_update_service(note) end def supported?(note) - self.class.supported?(note, current_user) + self.class.supported?(note) end def extract_commands(note, options = {}) |