Merge branch '44596-double-title-merge-request-message' into 'master'
Fix double title in merge request chat messages Closes #44586 See merge request gitlab-org/gitlab-ce!21670
This commit is contained in:
commit
983bd38f91
|
@ -48,7 +48,7 @@ module ChatMessage
|
|||
end
|
||||
|
||||
def merge_request_message
|
||||
"#{user_combined_name} #{state} #{merge_request_link} in #{project_link}: #{title}"
|
||||
"#{user_combined_name} #{state_or_action_text} #{merge_request_link} in #{project_link}"
|
||||
end
|
||||
|
||||
def merge_request_link
|
||||
|
@ -62,5 +62,10 @@ module ChatMessage
|
|||
def merge_request_url
|
||||
"#{project_url}/merge_requests/#{merge_request_iid}"
|
||||
end
|
||||
|
||||
# overridden in EE
|
||||
def state_or_action_text
|
||||
state
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix double title in merge request chat messages.
|
||||
merge_request: 21670
|
||||
author: Kukovskii Vladimir
|
||||
type: fixed
|
|
@ -33,7 +33,7 @@ describe ChatMessage::MergeMessage do
|
|||
context 'open' do
|
||||
it 'returns a message regarding opening of merge requests' do
|
||||
expect(subject.pretext).to eq(
|
||||
'Test User (test.user) opened <http://somewhere.com/merge_requests/100|!100 *Merge Request title*> in <http://somewhere.com|project_name>: *Merge Request title*')
|
||||
'Test User (test.user) opened <http://somewhere.com/merge_requests/100|!100 *Merge Request title*> in <http://somewhere.com|project_name>')
|
||||
expect(subject.attachments).to be_empty
|
||||
end
|
||||
end
|
||||
|
@ -44,7 +44,7 @@ describe ChatMessage::MergeMessage do
|
|||
end
|
||||
it 'returns a message regarding closing of merge requests' do
|
||||
expect(subject.pretext).to eq(
|
||||
'Test User (test.user) closed <http://somewhere.com/merge_requests/100|!100 *Merge Request title*> in <http://somewhere.com|project_name>: *Merge Request title*')
|
||||
'Test User (test.user) closed <http://somewhere.com/merge_requests/100|!100 *Merge Request title*> in <http://somewhere.com|project_name>')
|
||||
expect(subject.attachments).to be_empty
|
||||
end
|
||||
end
|
||||
|
@ -58,7 +58,7 @@ describe ChatMessage::MergeMessage do
|
|||
context 'open' do
|
||||
it 'returns a message regarding opening of merge requests' do
|
||||
expect(subject.pretext).to eq(
|
||||
'Test User (test.user) opened [!100 *Merge Request title*](http://somewhere.com/merge_requests/100) in [project_name](http://somewhere.com): *Merge Request title*')
|
||||
'Test User (test.user) opened [!100 *Merge Request title*](http://somewhere.com/merge_requests/100) in [project_name](http://somewhere.com)')
|
||||
expect(subject.attachments).to be_empty
|
||||
expect(subject.activity).to eq({
|
||||
title: 'Merge Request opened by Test User (test.user)',
|
||||
|
@ -76,7 +76,7 @@ describe ChatMessage::MergeMessage do
|
|||
|
||||
it 'returns a message regarding closing of merge requests' do
|
||||
expect(subject.pretext).to eq(
|
||||
'Test User (test.user) closed [!100 *Merge Request title*](http://somewhere.com/merge_requests/100) in [project_name](http://somewhere.com): *Merge Request title*')
|
||||
'Test User (test.user) closed [!100 *Merge Request title*](http://somewhere.com/merge_requests/100) in [project_name](http://somewhere.com)')
|
||||
expect(subject.attachments).to be_empty
|
||||
expect(subject.activity).to eq({
|
||||
title: 'Merge Request closed by Test User (test.user)',
|
||||
|
|
Loading…
Reference in New Issue