diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:07:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:07:57 +0300 |
commit | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (patch) | |
tree | 9d93267209387e62d23ea7abf81ef9c0d64f2f0b /db | |
parent | a325f3a104748ecc68df7c3d793940aa709a111f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200207062728_add_default_branch_protection_to_namespaces.rb | 13 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/db/migrate/20200207062728_add_default_branch_protection_to_namespaces.rb b/db/migrate/20200207062728_add_default_branch_protection_to_namespaces.rb new file mode 100644 index 00000000000..c21cac307f9 --- /dev/null +++ b/db/migrate/20200207062728_add_default_branch_protection_to_namespaces.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class AddDefaultBranchProtectionToNamespaces < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + with_lock_retries do + add_column :namespaces, :default_branch_protection, :integer, limit: 2 + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 149582f94bf..fa251f65741 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2762,6 +2762,7 @@ ActiveRecord::Schema.define(version: 2020_02_26_162723) do t.integer "max_pages_size" t.integer "max_artifacts_size" t.boolean "mentions_disabled" + t.integer "default_branch_protection", limit: 2 t.index ["created_at"], name: "index_namespaces_on_created_at" t.index ["custom_project_templates_group_id", "type"], name: "index_namespaces_on_custom_project_templates_group_id_and_type", where: "(custom_project_templates_group_id IS NOT NULL)" t.index ["file_template_project_id"], name: "index_namespaces_on_file_template_project_id" |