diff options
author | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
---|---|---|
committer | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
commit | b988faaf85c8e68d501f242b980e5e79a00e2b15 (patch) | |
tree | faffbfe623bfcbfe1c09bddac00b2cc879baff63 /db/schema.rb | |
parent | 5af4cae544c8526de63e639bd6c7db730526add3 (diff) | |
parent | 53db7d1d75e1d14cb20278bd0c1a75ce24a6626d (diff) | |
download | gitlab-ce-b988faaf85c8e68d501f242b980e5e79a00e2b15.tar.gz |
Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce
# Conflicts:
# db/schema.rb
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 50f723a1a0b..1099397824d 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: 20170130204620) do +ActiveRecord::Schema.define(version: 20170204181513) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -110,6 +110,7 @@ ActiveRecord::Schema.define(version: 20170130204620) do t.string "plantuml_url" t.boolean "plantuml_enabled" t.integer "max_pages_size", default: 100, null: false + t.integer "terminal_max_session_time", default: 0, null: false end create_table "audit_events", force: :cascade do |t| @@ -577,6 +578,7 @@ ActiveRecord::Schema.define(version: 20170130204620) do end add_index "labels", ["group_id", "project_id", "title"], name: "index_labels_on_group_id_and_project_id_and_title", unique: true, using: :btree + add_index "labels", ["type", "project_id"], name: "index_labels_on_type_and_project_id", using: :btree create_table "lfs_objects", force: :cascade do |t| t.string "oid", null: false |