diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-13 00:22:55 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-13 00:31:08 -0400 |
| commit | 567a25b63032a82fd188177ea7a29a92ca2dc381 (patch) | |
| tree | 3e4da482eda8279bd5154c37ee3ec04ac39afd5b /db | |
| parent | 89b56c81d0592390678c846b3a3db1ba35d9f0d4 (diff) | |
| download | gitlab-ce-567a25b63032a82fd188177ea7a29a92ca2dc381.tar.gz | |
Ensure `session_expire_delay` field exists before accessing itrs-issue-1798
Closes #1798
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/db/schema.rb b/db/schema.rb index 04f887274de..9a9d4a85e4b 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: 20150604202921) do +ActiveRecord::Schema.define(version: 20150609141121) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -29,13 +29,13 @@ ActiveRecord::Schema.define(version: 20150604202921) do t.boolean "twitter_sharing_enabled", default: true t.text "restricted_visibility_levels" t.boolean "version_check_enabled", default: true - t.integer "max_attachment_size", default: 10, null: false + t.integer "max_attachment_size", default: 10, null: false t.integer "default_project_visibility" t.integer "default_snippet_visibility" t.text "restricted_signup_domains" t.boolean "user_oauth_applications", default: true t.string "after_sign_out_path" - t.integer "session_expire_delay", default: 10080, null: false + t.integer "session_expire_delay", default: 10080, null: false end create_table "broadcast_messages", force: true do |t| @@ -496,12 +496,12 @@ ActiveRecord::Schema.define(version: 20150604202921) do t.string "bitbucket_access_token" t.string "bitbucket_access_token_secret" t.string "location" - t.string "public_email", default: "", null: false t.string "encrypted_otp_secret" t.string "encrypted_otp_secret_iv" t.string "encrypted_otp_secret_salt" t.boolean "otp_required_for_login" t.text "otp_backup_codes" + t.string "public_email", default: "", null: false end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |