diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 12:09:45 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 12:09:45 +0200 |
| commit | 8c6cbd430639f03461df625ff1cbeca1294f4b25 (patch) | |
| tree | efab5b4324c6166141e42eaaa04de3087e356b8d /db/schema.rb | |
| parent | 7780a886e7c90b2fbe281d3b8452151c20659543 (diff) | |
| parent | 4b31f4b68319a9099a36d6e59f153a1ae0a50f1d (diff) | |
| download | gitlab-ce-8c6cbd430639f03461df625ff1cbeca1294f4b25.tar.gz | |
Merge branch 'master' into admin-edit-identitiesadmin-edit-identities
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index f063a4868b1..3a5af6a76d4 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: 20150610065936) do +ActiveRecord::Schema.define(version: 20150620233230) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -499,7 +499,7 @@ ActiveRecord::Schema.define(version: 20150610065936) do t.string "encrypted_otp_secret" t.string "encrypted_otp_secret_iv" t.string "encrypted_otp_secret_salt" - t.boolean "otp_required_for_login" + t.boolean "otp_required_for_login", default: false, null: false t.text "otp_backup_codes" t.string "public_email", default: "", null: false t.integer "dashboard", default: 0 |