diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 18:08:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 18:08:31 +0000 |
commit | 92f95ccac81911d1fcc32e999a7f1ce04624a56c (patch) | |
tree | ad207e86b7858ae93a085fbdc04155f5cd469620 /db | |
parent | 85e494935a8726dc98bb19ffa584488420e5011e (diff) | |
download | gitlab-ce-92f95ccac81911d1fcc32e999a7f1ce04624a56c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20191218122457_add_force_pages_access_control_to_application_settings.rb | 12 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/db/migrate/20191218122457_add_force_pages_access_control_to_application_settings.rb b/db/migrate/20191218122457_add_force_pages_access_control_to_application_settings.rb new file mode 100644 index 00000000000..97352fc98ff --- /dev/null +++ b/db/migrate/20191218122457_add_force_pages_access_control_to_application_settings.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddForcePagesAccessControlToApplicationSettings < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :application_settings, :force_pages_access_control, :boolean, null: false, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 56b0cbde61a..7f1a7ac0ff1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -364,6 +364,7 @@ ActiveRecord::Schema.define(version: 2020_01_08_233040) do t.string "encrypted_slack_app_secret_iv", limit: 255 t.text "encrypted_slack_app_verification_token" t.string "encrypted_slack_app_verification_token_iv", limit: 255 + t.boolean "force_pages_access_control", default: false, null: false t.boolean "updating_name_disabled_for_users", default: false, null: false t.integer "instance_administrators_group_id" t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id" |