diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /lib/gitlab/email | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'lib/gitlab/email')
| -rw-r--r-- | lib/gitlab/email/handler/reply_processing.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/email/handler/service_desk_handler.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/email/handler/reply_processing.rb b/lib/gitlab/email/handler/reply_processing.rb index 1beea4f9054..9e476dd4e2b 100644 --- a/lib/gitlab/email/handler/reply_processing.rb +++ b/lib/gitlab/email/handler/reply_processing.rb @@ -45,7 +45,7 @@ module Gitlab end def add_attachments(reply) - attachments = Email::AttachmentUploader.new(mail).execute(upload_params) + attachments = Email::AttachmentUploader.new(mail).execute(**upload_params) reply + attachments.map do |link| "\n\n#{link[:markdown]}" 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? |