diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-01-02 14:41:28 -0600 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2019-01-03 14:37:35 -0600 |
| commit | 4a0801b9c04d671b09eaaa2fd5edadfe6ee56122 (patch) | |
| tree | 626ccada6db9af89d08f41a38b5ce9bd1807c90a | |
| parent | 496c6165d1e86d108e45b239cfdbf2ed721e148c (diff) | |
| download | gitlab-ce-29951-issue-creation-by-email-without-subaddressing.tar.gz | |
Fix already initialized constant constant warning29951-issue-creation-by-email-without-subaddressing
| -rw-r--r-- | lib/gitlab/email/handler.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/email/handler/base_handler.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/email/handler/create_issue_handler.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/email/handler/create_merge_request_handler.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/email/handler.rb b/lib/gitlab/email/handler.rb index d4806af97a5..cebedb19dcc 100644 --- a/lib/gitlab/email/handler.rb +++ b/lib/gitlab/email/handler.rb @@ -3,8 +3,6 @@ module Gitlab module Email module Handler - HANDLER_ACTION_BASE_REGEX = /(?<project_slug>.+)-(?<project_id>\d+)-(?<incoming_email_token>.+)/.freeze - def self.handlers @handlers ||= load_handlers end diff --git a/lib/gitlab/email/handler/base_handler.rb b/lib/gitlab/email/handler/base_handler.rb index 3f34a7e1d38..f89d1d15010 100644 --- a/lib/gitlab/email/handler/base_handler.rb +++ b/lib/gitlab/email/handler/base_handler.rb @@ -6,6 +6,8 @@ module Gitlab class BaseHandler attr_reader :mail, :mail_key + HANDLER_ACTION_BASE_REGEX ||= /(?<project_slug>.+)-(?<project_id>\d+)/.freeze + def initialize(mail, mail_key) @mail = mail @mail_key = mail_key diff --git a/lib/gitlab/email/handler/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb index 179fc3a69f7..78a3a9489ac 100644 --- a/lib/gitlab/email/handler/create_issue_handler.rb +++ b/lib/gitlab/email/handler/create_issue_handler.rb @@ -11,7 +11,7 @@ module Gitlab class CreateIssueHandler < BaseHandler include ReplyProcessing - HANDLER_REGEX = /\A#{Gitlab::Email::Handler::HANDLER_ACTION_BASE_REGEX}-issue\z/.freeze + HANDLER_REGEX = /\A#{HANDLER_ACTION_BASE_REGEX}-(?<incoming_email_token>.+)-issue\z/.freeze HANDLER_REGEX_LEGACY = /\A(?<project_path>[^\+]*)\+(?<incoming_email_token>.*)\z/.freeze def initialize(mail, mail_key) diff --git a/lib/gitlab/email/handler/create_merge_request_handler.rb b/lib/gitlab/email/handler/create_merge_request_handler.rb index 4cb983ceb73..b3b5063f2ca 100644 --- a/lib/gitlab/email/handler/create_merge_request_handler.rb +++ b/lib/gitlab/email/handler/create_merge_request_handler.rb @@ -12,7 +12,7 @@ module Gitlab class CreateMergeRequestHandler < BaseHandler include ReplyProcessing - HANDLER_REGEX = /\A#{Gitlab::Email::Handler::HANDLER_ACTION_BASE_REGEX}-merge-request\z/.freeze + HANDLER_REGEX = /\A#{HANDLER_ACTION_BASE_REGEX}-(?<incoming_email_token>.+)-merge-request\z/.freeze HANDLER_REGEX_LEGACY = /\A(?<project_path>[^\+]*)\+merge-request\+(?<incoming_email_token>.*)/.freeze def initialize(mail, mail_key) |