diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-25 15:07:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-25 15:07:45 +0300 |
| commit | 7b1fa4c1a1b784c2f78405dca82e56a009f1e773 (patch) | |
| tree | d56557b05ce90b8e4e20f514c835579a3c1e9d85 /db | |
| parent | 06b4bed158fc0772cf4363e65baef9ca9357c07b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20230116160904_remove_user_details_fields_from_user.rb | 14 | ||||
| -rw-r--r-- | db/schema_migrations/20230116160904 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/db/post_migrate/20230116160904_remove_user_details_fields_from_user.rb b/db/post_migrate/20230116160904_remove_user_details_fields_from_user.rb new file mode 100644 index 00000000000..8842f75e691 --- /dev/null +++ b/db/post_migrate/20230116160904_remove_user_details_fields_from_user.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class RemoveUserDetailsFieldsFromUser < Gitlab::Database::Migration[2.1] + enable_lock_retries! + + def change + %i[linkedin twitter skype website_url].each do |column| + remove_column :users, column, :string, null: false, default: '' + end + %i[location organization].each do |column| + remove_column :users, column, :string, null: true + end + end +end diff --git a/db/schema_migrations/20230116160904 b/db/schema_migrations/20230116160904 new file mode 100644 index 00000000000..278ed9bd572 --- /dev/null +++ b/db/schema_migrations/20230116160904 @@ -0,0 +1 @@ +b699539dfc4453d93c64b6b3532531ec9000d61cfc81ae5267c2c52eb489632f
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 793eddd8c25..8c4ac43ff58 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -22893,9 +22893,6 @@ CREATE TABLE users ( name character varying, admin boolean DEFAULT false NOT NULL, projects_limit integer NOT NULL, - skype character varying DEFAULT ''::character varying NOT NULL, - linkedin character varying DEFAULT ''::character varying NOT NULL, - twitter character varying DEFAULT ''::character varying NOT NULL, failed_attempts integer DEFAULT 0, locked_at timestamp without time zone, username character varying, @@ -22912,12 +22909,10 @@ CREATE TABLE users ( confirmation_sent_at timestamp without time zone, unconfirmed_email character varying, hide_no_ssh_key boolean DEFAULT false, - website_url character varying DEFAULT ''::character varying NOT NULL, admin_email_unsubscribed_at timestamp without time zone, notification_email character varying, hide_no_password boolean DEFAULT false, password_automatically_set boolean DEFAULT false, - location character varying, encrypted_otp_secret character varying, encrypted_otp_secret_iv character varying, encrypted_otp_secret_salt character varying, @@ -22934,7 +22929,6 @@ CREATE TABLE users ( otp_grace_period_started_at timestamp without time zone, external boolean DEFAULT false, incoming_email_token character varying, - organization character varying, auditor boolean DEFAULT false NOT NULL, require_two_factor_authentication_from_group boolean DEFAULT false NOT NULL, two_factor_grace_period integer DEFAULT 48 NOT NULL, |