diff --git a/db/post_migrate/20220822071909_remove_other_role_from_user_details.rb b/db/post_migrate/20220822071909_remove_other_role_from_user_details.rb new file mode 100644 index 0000000000000000000000000000000000000000..a0177bf26058137f86b5bb1e6eb5d76fc902bdbd --- /dev/null +++ b/db/post_migrate/20220822071909_remove_other_role_from_user_details.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class RemoveOtherRoleFromUserDetails < Gitlab::Database::Migration[2.0] + enable_lock_retries! + + def change + remove_column :user_details, :other_role, :text + end +end diff --git a/db/schema_migrations/20220822071909 b/db/schema_migrations/20220822071909 new file mode 100644 index 0000000000000000000000000000000000000000..fd8af68d1ee5dc3f96fe4a8f1ba0e2b54729878e --- /dev/null +++ b/db/schema_migrations/20220822071909 @@ -0,0 +1 @@ +60a72830780190214d6c86fc2d07dc0fc138f6cc258689c1d106bb456b130047 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index b291dfe7591e7f1d9ca0db5a01fa394a3c68dd0b..16523fb3d58d010f270c43d1237f5b753d6acfcf 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -21887,7 +21887,6 @@ CREATE TABLE user_details ( job_title character varying(200) DEFAULT ''::character varying NOT NULL, bio character varying(255) DEFAULT ''::character varying NOT NULL, webauthn_xid text, - other_role text, provisioned_by_group_id bigint, pronouns text, pronunciation text, @@ -21896,7 +21895,6 @@ CREATE TABLE user_details ( requires_credit_card_verification boolean DEFAULT false NOT NULL, CONSTRAINT check_245664af82 CHECK ((char_length(webauthn_xid) <= 100)), CONSTRAINT check_a73b398c60 CHECK ((char_length(phone) <= 50)), - CONSTRAINT check_b132136b01 CHECK ((char_length(other_role) <= 100)), CONSTRAINT check_eeeaf8d4f0 CHECK ((char_length(pronouns) <= 50)), CONSTRAINT check_f932ed37db CHECK ((char_length(pronunciation) <= 255)) ); diff --git a/ee/app/controllers/ee/registrations/welcome_controller.rb b/ee/app/controllers/ee/registrations/welcome_controller.rb index bea36a3750fcd069e76fa851918a02ae56fd7cc5..3b569f14219c67961d8a01603a3edbe29440e2f2 100644 --- a/ee/app/controllers/ee/registrations/welcome_controller.rb +++ b/ee/app/controllers/ee/registrations/welcome_controller.rb @@ -122,7 +122,7 @@ def path_for_signed_in_user(user) stored_url = stored_location_for(user) if ::Feature.enabled?(:about_your_company_registration_flow) && stored_url&.include?(new_users_sign_up_company_path) - company_params = update_params.slice(:role, :other_role, :registration_objective) + company_params = update_params.slice(:role, :registration_objective) .merge(params.permit(:jobs_to_be_done_other)) redirect_uri = ::Gitlab::Utils.add_url_parameters(stored_url, company_params) store_location_for(:user, redirect_uri)