diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 17:15:09 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 17:15:09 -0500 |
| commit | ecee057795ff22c335cb999bb677fbc623e879df (patch) | |
| tree | d99398c3e8574848308641a9b21e5a3305208ae9 /db/schema.rb | |
| parent | 6d19e13df62376916e024ff44939bf2a8f5b671b (diff) | |
| parent | d7a28f3c12950d56a187148fda9dce39a9f2bf08 (diff) | |
| download | gitlab-ce-ecee057795ff22c335cb999bb677fbc623e879df.tar.gz | |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index 7683aad968c..9b5aa640cb0 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: 20160421130527) do +ActiveRecord::Schema.define(version: 20160509201028) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -80,6 +80,8 @@ ActiveRecord::Schema.define(version: 20160421130527) do t.boolean "repository_checks_enabled", default: false t.text "shared_runners_text" t.integer "metrics_packet_size", default: 1 + t.text "disabled_oauth_sign_in_sources" + t.string "health_check_access_token" end create_table "audit_events", force: :cascade do |t| @@ -728,7 +730,6 @@ ActiveRecord::Schema.define(version: 20160421130527) do t.datetime "updated_at" t.integer "creator_id" t.boolean "issues_enabled", default: true, null: false - t.boolean "wall_enabled", default: true, null: false t.boolean "merge_requests_enabled", default: true, null: false t.boolean "wiki_enabled", default: true, null: false t.integer "namespace_id" |