Merge branch '364286-dropping-user_details-other_role-column' into 'master'

Drop user_details.other_role column

See merge request gitlab-org/gitlab!95889

db/post_migrate/20220822071909_remove_other_role_from_user_details.rb

+# 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

db/schema_migrations/20220822071909

+60a72830780190214d6c86fc2d07dc0fc138f6cc258689c1d106bb456b130047
\ No newline at end of file

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))
 );

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)