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:
authorAlex Buijs <abuijs@gitlab.com>2019-07-31 17:48:38 +0300
committerAlex Buijs <abuijs@gitlab.com>2019-08-08 14:58:09 +0300
commit5cbe16c3d2a3a3667021fb8c81f743308aefbdae (patch)
tree0f8330c9e782d452a780443fe7cd00486cc3cae9 /app/models
parent2bc0f0cfcf7b201df2e55afb5c1360f3d591782a (diff)
Set Devise's allow_unconfirmed_access_for
to 30 days
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index ac83c8e3256..4adc44a9375 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1505,6 +1505,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