Commit dca2aaaf authored by Sean McGivern's avatar Sean McGivern

Merge branch 'feature/service-desk-be-backport' into 'master'

Backport permissions and multi-line array to CE

See merge request !10507
parents 333a4c8c 60c121eb
...@@ -10,6 +10,7 @@ class GlobalPolicy < BasePolicy ...@@ -10,6 +10,7 @@ class GlobalPolicy < BasePolicy
can! :access_api can! :access_api
can! :access_git can! :access_git
can! :receive_notifications can! :receive_notifications
can! :use_slash_commands
end end
end end
end end
...@@ -7,6 +7,8 @@ module SlashCommands ...@@ -7,6 +7,8 @@ module SlashCommands
# Takes a text and interprets the commands that are extracted from it. # Takes a text and interprets the commands that are extracted from it.
# Returns the content without commands, and hash of changes to be applied to a record. # Returns the content without commands, and hash of changes to be applied to a record.
def execute(content, issuable) def execute(content, issuable)
return [content, {}] unless current_user.can?(:use_slash_commands)
@issuable = issuable @issuable = issuable
@updates = {} @updates = {}
......
...@@ -5,7 +5,11 @@ require 'gitlab/email/handler/unsubscribe_handler' ...@@ -5,7 +5,11 @@ require 'gitlab/email/handler/unsubscribe_handler'
module Gitlab module Gitlab
module Email module Email
module Handler module Handler
HANDLERS = [UnsubscribeHandler, CreateNoteHandler, CreateIssueHandler].freeze HANDLERS = [
UnsubscribeHandler,
CreateNoteHandler,
CreateIssueHandler
].freeze
def self.for(mail, mail_key) def self.for(mail, mail_key)
HANDLERS.find do |klass| HANDLERS.find do |klass|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment