diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-09 17:09:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-09 17:09:25 +0000 |
| commit | c4957ea958bbc9fcf30d59c8319ef5bf71d01219 (patch) | |
| tree | 4a64ef11c29e74924e931142029060a3822dddc9 /db/schema.rb | |
| parent | 0135ea6db4c1cc3968691343c6b7cac191502cb8 (diff) | |
| parent | 96b9c070ad102ec1004921ff318e2a0a591a5a9c (diff) | |
| download | gitlab-ce-c4957ea958bbc9fcf30d59c8319ef5bf71d01219.tar.gz | |
Merge branch 'master' into 'fix-project-mirror-data-schema'
# Conflicts:
# db/schema.rb
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 ec0aa5f6603..95adccf0d5c 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: 20180508102840) do +ActiveRecord::Schema.define(version: 20180508135515) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -497,7 +497,7 @@ ActiveRecord::Schema.define(version: 20180508102840) do t.integer "access_level", default: 0, null: false t.string "ip_address" t.integer "maximum_timeout" - t.integer "runner_type", limit: 2 + t.integer "runner_type", limit: 2, null: false end add_index "ci_runners", ["contacted_at"], name: "index_ci_runners_on_contacted_at", using: :btree @@ -2148,6 +2148,7 @@ ActiveRecord::Schema.define(version: 20180508102840) do add_foreign_key "ci_build_trace_sections", "ci_builds", column: "build_id", name: "fk_4ebe41f502", on_delete: :cascade add_foreign_key "ci_build_trace_sections", "projects", on_delete: :cascade add_foreign_key "ci_builds", "ci_pipelines", column: "auto_canceled_by_id", name: "fk_a2141b1522", on_delete: :nullify + add_foreign_key "ci_builds", "ci_pipelines", column: "commit_id", name: "fk_d3130c9a7f", on_delete: :cascade add_foreign_key "ci_builds", "ci_stages", column: "stage_id", name: "fk_3a9eaa254d", on_delete: :cascade add_foreign_key "ci_builds", "projects", name: "fk_befce0568a", on_delete: :cascade add_foreign_key "ci_builds_metadata", "ci_builds", column: "build_id", on_delete: :cascade |