diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-21 17:53:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-21 17:53:20 +0000 |
| commit | 9570495e75f90d1011531753dd41f0c06e8fcf99 (patch) | |
| tree | d3326bfcba348788103a5298ab9d4475bc22b773 /spec/models | |
| parent | 17ed42e362032e3594ae1cf34e6a970be826bdca (diff) | |
| parent | be41d84fb078667694ecbf5f2729175fbf8b0343 (diff) | |
| download | gitlab-ce-9570495e75f90d1011531753dd41f0c06e8fcf99.tar.gz | |
Merge branch 'add_email_unlock' into 'master'
Allow account unlock via email
We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.
See merge request !2049
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/user_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 376266c0955..2f184bbaf92 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -26,6 +26,7 @@ # bio :string(255) # failed_attempts :integer default(0) # locked_at :datetime +# unlock_token :string(255) # username :string(255) # can_create_group :boolean default(TRUE), not null # can_create_team :boolean default(TRUE), not null |