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 /db/migrate | |
| 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 'db/migrate')
| -rw-r--r-- | db/migrate/20151210030143_add_unlock_token_to_user.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/db/migrate/20151210030143_add_unlock_token_to_user.rb b/db/migrate/20151210030143_add_unlock_token_to_user.rb new file mode 100644 index 00000000000..0ea66ba65df --- /dev/null +++ b/db/migrate/20151210030143_add_unlock_token_to_user.rb @@ -0,0 +1,5 @@ +class AddUnlockTokenToUser < ActiveRecord::Migration + def change + add_column :users, :unlock_token, :string + end +end |