diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-20 01:29:11 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-20 01:29:11 +0000 |
| commit | 70cc319b87f7a8c8fa57e5fb577d56c519884dda (patch) | |
| tree | 091acc4bff3a178fde0b20622fd805a0e7988d5b /lib | |
| parent | 0d62f283d6df79b75cdbbf79cce4b8aad9cbc778 (diff) | |
| parent | 97dddf39cd98d49f02b9adae3b7aeb3b28c434a6 (diff) | |
| download | gitlab-ce-70cc319b87f7a8c8fa57e5fb577d56c519884dda.tar.gz | |
Merge branch 'disable-issue-by-email' into 'master'
Disable “issue by email” feature until it uses a different token
Separate token being worked on in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5914, but too late for 8.11.
See merge request !5915
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/email/handler.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/email/handler.rb b/lib/gitlab/email/handler.rb index bd3267e2a80..5cf9d5ebe28 100644 --- a/lib/gitlab/email/handler.rb +++ b/lib/gitlab/email/handler.rb @@ -4,7 +4,8 @@ require 'gitlab/email/handler/create_issue_handler' module Gitlab module Email module Handler - HANDLERS = [CreateNoteHandler, CreateIssueHandler] + # The `CreateIssueHandler` feature is disabled for the time being. + HANDLERS = [CreateNoteHandler] def self.for(mail, mail_key) HANDLERS.find do |klass| |