Commit b3f30cf8 authored by Robert Speicher's avatar Robert Speicher

Merge branch '275169-remove-service-desk-issue-prefix' into 'master'

Remove Default Service Desk Issue Title Prefix

See merge request gitlab-org/gitlab!54140
parents 77239704 12184d16
---
title: Remove service desk issue prefix
merge_request: 54140
author: Lee Tickett @leetickett
type: changed
......@@ -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
......
......@@ -36,7 +36,7 @@ RSpec.describe Gitlab::Email::Handler::ServiceDeskHandler do
expect(new_issue.author).to eql(User.support_bot)
expect(new_issue.confidential?).to be true
expect(new_issue.all_references.all).to be_empty
expect(new_issue.title).to eq("Service Desk (from jake@adventuretime.ooo): The message subject! @all")
expect(new_issue.title).to eq("The message subject! @all")
expect(new_issue.description).to eq(expected_description.strip)
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment