diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-07 11:01:21 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-07 11:01:21 +0000 |
| commit | 546b18b90317c0c9c0163ddcc5c54798a0bed841 (patch) | |
| tree | ff10c1965e629113b25be892a72c0f181f1b8671 /app/models/user.rb | |
| parent | 3cb798357fbfb8b3230b60130fc1c6b328ae84b7 (diff) | |
| parent | d13669716ab0c31ce9039ae9f7f073e33a4dc40f (diff) | |
| download | gitlab-ce-546b18b90317c0c9c0163ddcc5c54798a0bed841.tar.gz | |
Merge branch 'tc-geo-read-only-idea' into 'master'
Create idea of read-only database
Closes #37534
See merge request gitlab-org/gitlab-ce!14688
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index c3f115ca074..533a776bc65 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -459,6 +459,14 @@ class User < ActiveRecord::Base reset_password_sent_at.present? && reset_password_sent_at >= 1.minute.ago end + def remember_me! + super if ::Gitlab::Database.read_write? + end + + def forget_me! + super if ::Gitlab::Database.read_write? + end + def disable_two_factor! transaction do update_attributes( |