summaryrefslogtreecommitdiff
path: root/db
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 /db
parentb95f7b1864672b873501792775521a6bd6393520 (diff)
downloadgitlab-ce-be41d84fb078667694ecbf5f2729175fbf8b0343.tar.gz
Allow account unlock via email
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20151210030143_add_unlock_token_to_user.rb5
-rw-r--r--db/schema.rb1
2 files changed, 6 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
diff --git a/db/schema.rb b/db/schema.rb
index 0167e30ff8b..60b42f7a473 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -837,6 +837,7 @@ ActiveRecord::Schema.define(version: 20151210125932) do
t.integer "consumed_timestep"
t.integer "layout", default: 0
t.boolean "hide_project_limit", default: false
+ t.string "unlock_token"
end
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree