diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 06:08:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 06:08:57 +0300 |
commit | 852f4a85dd199751e4652748461163de85ecda53 (patch) | |
tree | b4160aa19c23582b5ab5ac02f9860b5498007c43 /db | |
parent | 82cd20acf9f4cceecf222abe718a9e23cef55687 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200213093702_add_email_restrictions_to_application_settings.rb | 15 | ||||
-rw-r--r-- | db/schema.rb | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/db/migrate/20200213093702_add_email_restrictions_to_application_settings.rb b/db/migrate/20200213093702_add_email_restrictions_to_application_settings.rb new file mode 100644 index 00000000000..22d7b9f37e0 --- /dev/null +++ b/db/migrate/20200213093702_add_email_restrictions_to_application_settings.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class AddEmailRestrictionsToApplicationSettings < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def up + add_column(:application_settings, :email_restrictions_enabled, :boolean, default: false, null: false) + add_column(:application_settings, :email_restrictions, :text, null: true) + end + + def down + remove_column(:application_settings, :email_restrictions_enabled) + remove_column(:application_settings, :email_restrictions) + end +end diff --git a/db/schema.rb b/db/schema.rb index fec0ba6e753..d2ceceed88d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -349,6 +349,8 @@ ActiveRecord::Schema.define(version: 2020_02_13_220211) do t.boolean "disable_overriding_approvers_per_merge_request", default: false, null: false t.boolean "prevent_merge_requests_author_approval", default: false, null: false 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.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" |