diff options
| author | Utkarsh Gupta <guptautkarsh2102@gmail.com> | 2019-05-21 16:56:27 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-21 16:56:27 +0000 |
| commit | 1a2d05c3a675a08760caeacbc983903a2a4c14ac (patch) | |
| tree | c9c06bf6fc94cba217d847b76ed95135b7f24bf4 /app/models | |
| parent | ab7e8475ce15e57509d7a22127deed36431a66e5 (diff) | |
| download | gitlab-ce-1a2d05c3a675a08760caeacbc983903a2a4c14ac.tar.gz | |
Bump devise to 4.6
Signed-off-by: Utkarsh Gupta <guptautkarsh2102@gmail.com>
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 60f69659a6b..2eb5c63a4cc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1497,15 +1497,6 @@ class User < ApplicationRecord devise_mailer.__send__(notification, self, *args).deliver_later # rubocop:disable GitlabSecurity/PublicSend end - # This works around a bug in Devise 4.2.0 that erroneously causes a user to - # be considered active in MySQL specs due to a sub-second comparison - # issue. For more details, see: https://gitlab.com/gitlab-org/gitlab-ee/issues/2362#note_29004709 - def confirmation_period_valid? - return false if self.class.allow_unconfirmed_access_for == 0.days - - super - end - def ensure_user_rights_and_limits if external? self.can_create_group = false |