diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-21 11:24:55 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-21 11:24:55 +0200 |
| commit | a39228db8027c966e8117d40766b0cef4fbd50f6 (patch) | |
| tree | 143045af7214ae6746e7b7c9df647c71ec2bd675 /app/models/user.rb | |
| parent | 05f50c9b52fde54513fe55fef97499b35719eae2 (diff) | |
| parent | aed489bf901745ced6618e680913d0d213998923 (diff) | |
| download | gitlab-ce-docs-zm002-gitlab-case.tar.gz | |
Merge branch 'master' into docs-zm002-gitlab-casedocs-zm002-gitlab-case
Diffstat (limited to 'app/models/user.rb')
| -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 |