diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 09:09:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 09:09:13 +0000 |
commit | 1ac794623a8be5dee111716a44dd04ff708f3541 (patch) | |
tree | 6c18f9fbe0bd9978bd3e8d9b083d3a0ca180686e /db | |
parent | 5247fe0bef72fa922841a79d5dbefb47d95112fa (diff) | |
download | gitlab-ce-1ac794623a8be5dee111716a44dd04ff708f3541.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200206141511_change_saml_provider_outer_forks_default.rb | 15 | ||||
-rw-r--r-- | db/schema.rb | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/db/migrate/20200206141511_change_saml_provider_outer_forks_default.rb b/db/migrate/20200206141511_change_saml_provider_outer_forks_default.rb new file mode 100644 index 00000000000..971cc4da921 --- /dev/null +++ b/db/migrate/20200206141511_change_saml_provider_outer_forks_default.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class ChangeSamlProviderOuterForksDefault < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def up + change_column_null :saml_providers, :prohibited_outer_forks, false + change_column_default :saml_providers, :prohibited_outer_forks, true + end + + def down + change_column_default :saml_providers, :prohibited_outer_forks, false + change_column_null :saml_providers, :prohibited_outer_forks, true + end +end diff --git a/db/schema.rb b/db/schema.rb index d2ceceed88d..0796eea9bbe 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -3770,7 +3770,7 @@ ActiveRecord::Schema.define(version: 2020_02_13_220211) do t.string "sso_url", null: false t.boolean "enforced_sso", default: false, null: false t.boolean "enforced_group_managed_accounts", default: false, null: false - t.boolean "prohibited_outer_forks", default: false + t.boolean "prohibited_outer_forks", default: true, null: false t.index ["group_id"], name: "index_saml_providers_on_group_id" end |