summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2015-12-14 15:34:46 -0600
committerDrew Blessing <drew@gitlab.com>2015-12-14 15:35:02 -0600
commitbe41d84fb078667694ecbf5f2729175fbf8b0343 (patch)
tree3b5618dee5bd02d265e14f3e53450f0404458cbd /app/models/user.rb
parentb95f7b1864672b873501792775521a6bd6393520 (diff)
downloadgitlab-ce-be41d84fb078667694ecbf5f2729175fbf8b0343.tar.gz
Allow account unlock via email
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index fdd14f4571d..829c37e88c3 100644
--- a/app/models/user.rb
+++ b/app/models/user.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