Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 21:18:33 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-16 21:18:33 +0300
commitf64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch)
treea2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /lib/gitlab/email
parentbfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff)
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'lib/gitlab/email')
-rw-r--r--lib/gitlab/email/handler/service_desk_handler.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/gitlab/email/handler/service_desk_handler.rb b/lib/gitlab/email/handler/service_desk_handler.rb
index d1dd616385d..80e8b726099 100644
--- a/lib/gitlab/email/handler/service_desk_handler.rb
+++ b/lib/gitlab/email/handler/service_desk_handler.rb
@@ -79,7 +79,7 @@ module Gitlab
@issue = Issues::CreateService.new(
project,
User.support_bot,
- title: issue_title,
+ title: mail.subject,
description: message_including_template,
confidential: true,
external_author: from_address
@@ -137,12 +137,6 @@ module Gitlab
(mail.reply_to || []).first || mail.from.first || mail.sender
end
- def issue_title
- from = "(from #{from_address})" if from_address
-
- "Service Desk #{from}: #{mail.subject}"
- end
-
def can_handle_legacy_format?
project_path && project_path.include?('/') && !mail_key.include?('+')
end