diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-07 11:18:40 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-07 11:18:40 +0000 |
commit | dca2aaaf6ba03f6491b04e7df912f2f1bc156fb1 (patch) | |
tree | 24a15e4586f13aa727aa5f3cb7b7e8b9cfe95443 | |
parent | 333a4c8cf523ff0098d84b070ffbaf1828646b7b (diff) | |
parent | 60c121ebc202e0de31a5a6212346128341d2766b (diff) | |
download | gitlab-ce-dca2aaaf6ba03f6491b04e7df912f2f1bc156fb1.tar.gz |
Merge branch 'feature/service-desk-be-backport' into 'master'
Backport permissions and multi-line array to CE
See merge request !10507
-rw-r--r-- | app/policies/global_policy.rb | 1 | ||||
-rw-r--r-- | app/services/slash_commands/interpret_service.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/email/handler.rb | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/policies/global_policy.rb b/app/policies/global_policy.rb index cb72c2b4590..4757ba71680 100644 --- a/app/policies/global_policy.rb +++ b/app/policies/global_policy.rb @@ -10,6 +10,7 @@ class GlobalPolicy < BasePolicy can! :access_api can! :access_git can! :receive_notifications + can! :use_slash_commands end end end diff --git a/app/services/slash_commands/interpret_service.rb b/app/services/slash_commands/interpret_service.rb index 595653ea58a..49d45ec9dbd 100644 --- a/app/services/slash_commands/interpret_service.rb +++ b/app/services/slash_commands/interpret_service.rb @@ -7,6 +7,8 @@ module SlashCommands # 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. def execute(content, issuable) + return [content, {}] unless current_user.can?(:use_slash_commands) + @issuable = issuable @updates = {} diff --git a/lib/gitlab/email/handler.rb b/lib/gitlab/email/handler.rb index 35ea2e0ef59..b07c68d1498 100644 --- a/lib/gitlab/email/handler.rb +++ b/lib/gitlab/email/handler.rb @@ -5,7 +5,11 @@ require 'gitlab/email/handler/unsubscribe_handler' module Gitlab module Email module Handler - HANDLERS = [UnsubscribeHandler, CreateNoteHandler, CreateIssueHandler].freeze + HANDLERS = [ + UnsubscribeHandler, + CreateNoteHandler, + CreateIssueHandler + ].freeze def self.for(mail, mail_key) HANDLERS.find do |klass| |