From 2705a15deaef07b1a38a53b9539d02f8ad499ce3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 13 May 2022 09:07:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/members/creator_service.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/services/members') diff --git a/app/services/members/creator_service.rb b/app/services/members/creator_service.rb index 321658ac9c5..81986a2883f 100644 --- a/app/services/members/creator_service.rb +++ b/app/services/members/creator_service.rb @@ -82,7 +82,13 @@ module Members if member.request? approve_request else - member.save + # Calling #save triggers callbacks even if there is no change on object. + # This previously caused an incident due to the hard to predict + # behaviour caused by the large number of callbacks. + # See https://gitlab.com/gitlab-com/gl-infra/production/-/issues/6351 + # and https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80920#note_911569038 + # for details. + member.save if member.changed? end end -- cgit v1.2.1