提交 f56e7c68 编写于 作者: T Thong Kuah

Merge branch '65427-improve-system-notes-for-zoom-links' into 'master'

Resolve "Improve system notes for Zoom links"

Closes #65427

See merge request gitlab-org/gitlab-ce!31410
...@@ -598,11 +598,11 @@ module SystemNoteService ...@@ -598,11 +598,11 @@ module SystemNoteService
end end
def zoom_link_added(issue, project, author) def zoom_link_added(issue, project, author)
create_note(NoteSummary.new(issue, project, author, _('a Zoom call was added to this issue'), action: 'pinned_embed')) create_note(NoteSummary.new(issue, project, author, _('added a Zoom call to this issue'), action: 'pinned_embed'))
end end
def zoom_link_removed(issue, project, author) def zoom_link_removed(issue, project, author)
create_note(NoteSummary.new(issue, project, author, _('a Zoom call was removed from this issue'), action: 'pinned_embed')) create_note(NoteSummary.new(issue, project, author, _('removed a Zoom call from this issue'), action: 'pinned_embed'))
end end
private private
......
---
title: Improve system notes for Zoom links
merge_request: 31410
author: Jacopo Beschi @jacopo-beschi
type: changed
...@@ -13401,18 +13401,15 @@ msgstr "" ...@@ -13401,18 +13401,15 @@ msgstr ""
msgid "Your request for access has been queued for review." msgid "Your request for access has been queued for review."
msgstr "" msgstr ""
msgid "a Zoom call was added to this issue"
msgstr ""
msgid "a Zoom call was removed from this issue"
msgstr ""
msgid "a deleted user" msgid "a deleted user"
msgstr "" msgstr ""
msgid "added %{created_at_timeago}" msgid "added %{created_at_timeago}"
msgstr "" msgstr ""
msgid "added a Zoom call to this issue"
msgstr ""
msgid "ago" msgid "ago"
msgstr "" msgstr ""
...@@ -13949,6 +13946,9 @@ msgstr "" ...@@ -13949,6 +13946,9 @@ msgstr ""
msgid "remove due date" msgid "remove due date"
msgstr "" msgstr ""
msgid "removed a Zoom call from this issue"
msgstr ""
msgid "rendered diff" msgid "rendered diff"
msgstr "" msgstr ""
......
...@@ -229,10 +229,10 @@ describe Issues::UpdateService, :mailer do ...@@ -229,10 +229,10 @@ describe Issues::UpdateService, :mailer do
it 'creates zoom_link_added system note when a zoom link is added to the description' do it 'creates zoom_link_added system note when a zoom link is added to the description' do
update_issue(description: 'Changed description https://zoom.us/j/5873603787') update_issue(description: 'Changed description https://zoom.us/j/5873603787')
note = find_note('a Zoom call was added') note = find_note('added a Zoom call')
expect(note).not_to be_nil expect(note).not_to be_nil
expect(note.note).to eq('a Zoom call was added to this issue') expect(note.note).to eq('added a Zoom call to this issue')
end end
context 'when issue turns confidential' do context 'when issue turns confidential' do
......
...@@ -521,7 +521,7 @@ describe SystemNoteService do ...@@ -521,7 +521,7 @@ describe SystemNoteService do
end end
it 'sets the zoom link added note text' do it 'sets the zoom link added note text' do
expect(subject.note).to eq('a Zoom call was added to this issue') expect(subject.note).to eq('added a Zoom call to this issue')
end end
end end
...@@ -533,7 +533,7 @@ describe SystemNoteService do ...@@ -533,7 +533,7 @@ describe SystemNoteService do
end end
it 'sets the zoom link removed note text' do it 'sets the zoom link removed note text' do
expect(subject.note).to eq('a Zoom call was removed from this issue') expect(subject.note).to eq('removed a Zoom call from this issue')
end end
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册