diff options
| author | Brett Walker <bwalker@gitlab.com> | 2018-12-29 06:26:07 -0700 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2019-01-03 14:37:35 -0600 |
| commit | 496c6165d1e86d108e45b239cfdbf2ed721e148c (patch) | |
| tree | ac6a060c87fcc4e1713d84a581e0fcc21030121f | |
| parent | a4f2de796411236bfda81b7fa281cfa8199c5acf (diff) | |
| download | gitlab-ce-496c6165d1e86d108e45b239cfdbf2ed721e148c.tar.gz | |
Move constant definition
| -rw-r--r-- | lib/gitlab/email/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 | ||||
| -rw-r--r-- | lib/gitlab/email/handler/reply_processing.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/email/handler.rb b/lib/gitlab/email/handler.rb index cebedb19dcc..d4806af97a5 100644 --- a/lib/gitlab/email/handler.rb +++ b/lib/gitlab/email/handler.rb @@ -3,6 +3,8 @@ 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/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb index 50928f0d59e..179fc3a69f7 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#{HANDLER_ACTION_BASE_REGEX}-issue\z/.freeze + HANDLER_REGEX = /\A#{Gitlab::Email::Handler::HANDLER_ACTION_BASE_REGEX}-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 21bb09fa4a1..4cb983ceb73 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#{HANDLER_ACTION_BASE_REGEX}-merge-request\z/.freeze + HANDLER_REGEX = /\A#{Gitlab::Email::Handler::HANDLER_ACTION_BASE_REGEX}-merge-request\z/.freeze HANDLER_REGEX_LEGACY = /\A(?<project_path>[^\+]*)\+merge-request\+(?<incoming_email_token>.*)/.freeze def initialize(mail, mail_key) diff --git a/lib/gitlab/email/handler/reply_processing.rb b/lib/gitlab/email/handler/reply_processing.rb index 76b393f3259..ba9730d2685 100644 --- a/lib/gitlab/email/handler/reply_processing.rb +++ b/lib/gitlab/email/handler/reply_processing.rb @@ -6,8 +6,6 @@ module Gitlab module ReplyProcessing private - HANDLER_ACTION_BASE_REGEX = /(?<project_slug>.+)-(?<project_id>\d+)-(?<incoming_email_token>.+)/.freeze - attr_reader :project_id, :project_slug, :project_path, :incoming_email_token def author |