diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-12-25 01:31:02 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2015-12-25 01:31:02 +0200 |
| commit | d18fd3f6489ad2a8065f8ddd80ca51100eb50b5e (patch) | |
| tree | 1e809b9c4f694e20e9cc7dff06a9cb7f2f56aef2 /db/schema.rb | |
| parent | e74affcfa84acaddc236d6dfed7be1a61470dc0e (diff) | |
| parent | 350d65503f0fa34ae397942578c5ea8b2a46a629 (diff) | |
| download | gitlab-ce-ci_triggers_docs.tar.gz | |
Merge branch 'master' into ci_triggers_docsci_triggers_docs
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 0167e30ff8b..0d53105b057 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20151210125932) do +ActiveRecord::Schema.define(version: 20151224123230) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -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 |