From 546c4f78d1c0d673cd9bdb8a097a341b4c7352bf Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Thu, 6 Apr 2017 15:19:45 -0300 Subject: Backport permissions and multi-line array to CE --- app/policies/global_policy.rb | 1 + lib/gitlab/email/handler.rb | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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/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| -- cgit v1.2.1