diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-20 04:29:11 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-20 05:54:34 +0300 |
| commit | b591304061773a8164ff3afd5a99d69f25741833 (patch) | |
| tree | c727659cf4edbfe1b721d7e848538cd4bb2e40b1 /lib | |
| parent | be294efd8fa6dbe534af1f974b03caab3467a2f9 (diff) | |
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| |