diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 09:08:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 09:08:43 +0000 |
| commit | 26384c9a61da9922b8fa4b8351d4e42d51661b37 (patch) | |
| tree | ef3decbed644db3c97dcdbb5b71d4ade77f3155d /app/models/user.rb | |
| parent | 79cbe31b18159ea394c6f6e3027c1dc69bdabb75 (diff) | |
| download | gitlab-ce-26384c9a61da9922b8fa4b8351d4e42d51661b37.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d44e8162abe..a5ef03215d3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1638,13 +1638,6 @@ 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 |