diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-08-16 15:31:16 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-08-16 15:31:16 +0300 |
| commit | b1604f7d8f0095d637036721244830e8d3181596 (patch) | |
| tree | 10caf704bd6326c31e808b5a437d0bdbef6a5ff3 /app/models | |
| parent | 1441b23a4a9edce15e356e1543f7ff6fafc105ba (diff) | |
| parent | 54ddc018ac71f0ec7379c8528144bb9192ced510 (diff) | |
Merge branch '47003-user-onboarding-replace-current-email-confirmation-flow-with-a-soft-email-confirmation-flow' into 'master'
Soft email confirmation flow
Closes #47003
See merge request gitlab-org/gitlab-ce!31245
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 374e00987c5..6131a8dc710 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1507,6 +1507,13 @@ class User < ApplicationRecord super end + # override from Devise::Confirmable + def confirmation_period_valid? + return false if Feature.disabled?(:soft_email_confirmation) + + super + end + private def default_private_profile_to_false |