root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2023-10-21 03:12:02 +00:00
parent 754fbff4a0
commit 652dfd8e20
5 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
db/post_migrate/20231018083247_remove_users_email_opted_in_columns.rb Normal file
View File

@ -0,0 +1,22 @@
# frozen_string_literal: true
class RemoveUsersEmailOptedInColumns < Gitlab::Database::Migration[2.1]
enable_lock_retries!
def up
remove_column :users, :email_opted_in
remove_column :users, :email_opted_in_ip
remove_column :users, :email_opted_in_source_id
remove_column :users, :email_opted_in_at
end
# This migration removes columns. Disabling rule only for rollback action
# rubocop:disable Migration/AddColumnsToWideTables
def down
add_column :users, :email_opted_in, :boolean
add_column :users, :email_opted_in_ip, :string
add_column :users, :email_opted_in_source_id, :integer
add_column :users, :email_opted_in_at, :datetime_with_timezone
end
# rubocop:enable Migration/AddColumnsToWideTables
end

11
db/post_migrate/20231018105749_remove_application_settings_marketing_emails_enabled_column.rb Normal file
View File

@ -0,0 +1,11 @@
# frozen_string_literal: true
class RemoveApplicationSettingsMarketingEmailsEnabledColumn < Gitlab::Database::Migration[2.1]
def up
remove_column :application_settings, :in_product_marketing_emails_enabled
end
def down
add_column :application_settings, :in_product_marketing_emails_enabled, :boolean, default: true, null: false
end
end

1
db/schema_migrations/20231018083247 Normal file
View File

@ -0,0 +1 @@
ccf25454919c35e8275f48aca973fdd263e57d643640878aa776a7760b38e851

1
db/schema_migrations/20231018105749 Normal file
View File

@ -0,0 +1 @@
4289e51e278d842ec0a7344256ed5c3de2b0a3355de6437b079b75e3a607b7a8

5
db/structure.sql
View File

@ -11663,7 +11663,6 @@ CREATE TABLE application_settings (
notes_create_limit integer DEFAULT 300 NOT NULL,
notes_create_limit_allowlist text[] DEFAULT '{}'::text[] NOT NULL,
kroki_formats jsonb DEFAULT '{}'::jsonb NOT NULL,
in_product_marketing_emails_enabled boolean DEFAULT true NOT NULL,
asset_proxy_whitelist text,
admin_mode boolean DEFAULT false NOT NULL,
delayed_project_removal boolean DEFAULT false NOT NULL,
@ -24391,10 +24390,6 @@ CREATE TABLE users (
last_activity_on date,
notified_of_own_activity boolean DEFAULT false,
preferred_language character varying,
email_opted_in boolean,
email_opted_in_ip character varying,
email_opted_in_source_id integer,
email_opted_in_at timestamp without time zone,
theme_id smallint,
accepted_term_id integer,
feed_token character varying,