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:
Diffstat (limited to 'lib/gitlab/email/handler/service_desk_handler.rb')
-rw-r--r--lib/gitlab/email/handler/service_desk_handler.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/email/handler/service_desk_handler.rb b/lib/gitlab/email/handler/service_desk_handler.rb
index bcd8b98a06f..0bbe3980f67 100644
--- a/lib/gitlab/email/handler/service_desk_handler.rb
+++ b/lib/gitlab/email/handler/service_desk_handler.rb
@@ -68,7 +68,7 @@ module Gitlab
end
def valid_project_key?(project, slug)
- project.present? && slug == project.full_path_slug && Feature.enabled?(:service_desk_custom_address, project)
+ project.present? && slug == project.full_path_slug && Feature.enabled?(:service_desk_custom_address, project, default_enabled: true)
end
def create_issue!
@@ -78,7 +78,7 @@ module Gitlab
title: issue_title,
description: message_including_template,
confidential: true,
- service_desk_reply_to: from_address
+ external_author: from_address
).execute
raise InvalidIssueError unless @issue.persisted?