diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-03-03 21:24:16 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-03-03 21:24:16 +0300 |
| commit | 5bf2ab73ba1a812b90ec50be676378eb0ae58fa8 (patch) | |
| tree | 932cef8cd4d5063df10828cf4a02c0c31c631bb2 /db/schema.rb | |
| parent | 32538def144f88a68c5cdfbe7cb7cb2866bce932 (diff) | |
| parent | df63d9db40e568bcca87cf7946cf518684538a31 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/db/schema.rb b/db/schema.rb index 205299dbb5a..f6fda049b7d 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: 20170216141440) do +ActiveRecord::Schema.define(version: 20170217151947) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -691,7 +691,7 @@ ActiveRecord::Schema.define(version: 20170216141440) do t.integer "updated_by_id" t.text "merge_error" t.text "merge_params" - t.boolean "merge_when_build_succeeds", default: false, null: false + t.boolean "merge_when_pipeline_succeeds", default: false, null: false t.integer "merge_user_id" t.string "merge_commit_sha" t.datetime "deleted_at" @@ -974,7 +974,7 @@ ActiveRecord::Schema.define(version: 20170216141440) do t.boolean "last_repository_check_failed" t.datetime "last_repository_check_at" t.boolean "container_registry_enabled" - t.boolean "only_allow_merge_if_build_succeeds", default: false, null: false + t.boolean "only_allow_merge_if_pipeline_succeeds", default: false, null: false t.boolean "has_external_issue_tracker" t.string "repository_storage", default: "default", null: false t.boolean "request_access_enabled", default: false, null: false |