Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-17 14:59:07 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-17 14:59:07 +0300
commit8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch)
tree544930fb309b30317ae9797a9683768705d664c4 /app/services/members
parent4b1de649d0168371549608993deac953eb692019 (diff)
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/services/members')
-rw-r--r--app/services/members/create_service.rb6
-rw-r--r--app/services/members/invitation_reminder_email_service.rb6
2 files changed, 6 insertions, 6 deletions
diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb
index 088e6f031c8..3588cda180f 100644
--- a/app/services/members/create_service.rb
+++ b/app/services/members/create_service.rb
@@ -38,6 +38,8 @@ module Members
end
end
+ enqueue_onboarding_progress_action(source) if members.size > errors.size
+
return success unless errors.any?
error(errors.to_sentence)
@@ -50,6 +52,10 @@ module Members
limit && limit < 0 ? nil : limit
end
+
+ def enqueue_onboarding_progress_action(source)
+ Namespaces::OnboardingUserAddedWorker.perform_async(source.id)
+ end
end
end
diff --git a/app/services/members/invitation_reminder_email_service.rb b/app/services/members/invitation_reminder_email_service.rb
index e589cdc2fa3..688618ec4b4 100644
--- a/app/services/members/invitation_reminder_email_service.rb
+++ b/app/services/members/invitation_reminder_email_service.rb
@@ -14,8 +14,6 @@ module Members
end
def execute
- return unless experiment_enabled?
-
reminder_index = days_on_which_to_send_reminders.index(days_after_invitation_sent)
return unless reminder_index
@@ -24,10 +22,6 @@ module Members
private
- def experiment_enabled?
- Gitlab::Experimentation.enabled_for_attribute?(:invitation_reminders, invitation.invite_email)
- end
-
def days_after_invitation_sent
(Date.today - invitation.created_at.to_date).to_i
end