Skip to content
代码片段 群组 项目
未验证 提交 9075a64b 编辑于 作者: Carla Drago's avatar Carla Drago 提交者: GitLab
浏览文件

Merge branch 'georgekoltsov/dont-send-emails-on-invite-dt' into 'master'

Don't send email when importing members using DirectTransfer

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142546



Merged-by: default avatarCarla Drago <cdrago@gitlab.com>
Approved-by: default avatarJames Nutt <jnutt@gitlab.com>
Approved-by: default avatarCarla Drago <cdrago@gitlab.com>
Reviewed-by: default avatarJames Nutt <jnutt@gitlab.com>
Co-authored-by: default avatarGeorge Koltsov <gkoltsov@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -27,7 +27,9 @@ def load(_context, data) ...@@ -27,7 +27,9 @@ def load(_context, data)
return if user_membership && user_membership[:access_level] >= data[:access_level] return if user_membership && user_membership[:access_level] >= data[:access_level]
# Create new membership for any other access level # Create new membership for any other access level
portable.members.create!(data) member = portable.members.new(data)
member.importing = true # avoid sending new member notification to the invited user
member.save!
end end
private private
......
...@@ -87,6 +87,12 @@ def extracted_data(email:, has_next_page: false) ...@@ -87,6 +87,12 @@ def extracted_data(email:, has_next_page: false)
expect(member.expires_at).to eq(nil) expect(member.expires_at).to eq(nil)
end end
it 'does not send new member notification' do
expect(NotificationService).not_to receive(:new)
subject.load(context, member_data)
end
context 'when user_id is current user id' do context 'when user_id is current user id' do
it 'does not create new membership' do it 'does not create new membership' do
data = { user_id: user.id } data = { user_id: user.id }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册