diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 12:09:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 12:09:00 +0000 |
commit | ae78b85a25cb0c19c3d6a2e4e6c7ca91ed50787d (patch) | |
tree | c53ad0fcdab26725814f1dc5267f6a04ebe4cf73 /db | |
parent | 38149afcf95e7669a7a99828c579d185b70c04dc (diff) | |
download | gitlab-ce-ae78b85a25cb0c19c3d6a2e4e6c7ca91ed50787d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200221105436_update_application_setting_npm_package_requests_forwarding_default.rb | 17 | ||||
-rw-r--r-- | db/schema.rb | 4 |
2 files changed, 19 insertions, 2 deletions
diff --git a/db/migrate/20200221105436_update_application_setting_npm_package_requests_forwarding_default.rb b/db/migrate/20200221105436_update_application_setting_npm_package_requests_forwarding_default.rb new file mode 100644 index 00000000000..2479df2737d --- /dev/null +++ b/db/migrate/20200221105436_update_application_setting_npm_package_requests_forwarding_default.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class UpdateApplicationSettingNpmPackageRequestsForwardingDefault < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def up + change_column_default :application_settings, :npm_package_requests_forwarding, true + + execute('UPDATE application_settings SET npm_package_requests_forwarding = TRUE') + end + + def down + change_column_default :application_settings, :npm_package_requests_forwarding, false + + execute('UPDATE application_settings SET npm_package_requests_forwarding = FALSE') + end +end diff --git a/db/schema.rb b/db/schema.rb index 2fe21469398..792e5e7b8b5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_02_20_180944) do +ActiveRecord::Schema.define(version: 2020_02_21_105436) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" @@ -351,7 +351,7 @@ ActiveRecord::Schema.define(version: 2020_02_20_180944) do t.boolean "prevent_merge_requests_committers_approval", default: false, null: false t.boolean "email_restrictions_enabled", default: false, null: false t.text "email_restrictions" - t.boolean "npm_package_requests_forwarding", default: false, null: false + t.boolean "npm_package_requests_forwarding", default: true, null: false t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id" t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id" t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id" |