Merge branch '332592-revert-state-in-members' into 'master'

No-oped migration to add state to members

See merge request gitlab-org/gitlab!67046

db/migrate/20210721145029_add_state_to_members.rb

@@ -4,14 +4,10 @@ class AddStateToMembers < ActiveRecord::Migration[6.1]
   include Gitlab::Database::MigrationHelpers
 
   def up
-    with_lock_retries do
-      add_column :members, :state, :integer, limit: 2, default: 0
-    end
+    # no-op
   end
 
   def down
-    with_lock_retries do
-      remove_column :members, :state
-    end
+    # no-op
   end
 end

db/structure.sql

@@ -14766,8 +14766,7 @@ CREATE TABLE members (
     expires_at date,
     ldap boolean DEFAULT false NOT NULL,
     override boolean DEFAULT false NOT NULL,
-    invite_email_success boolean DEFAULT true NOT NULL,
-    state smallint DEFAULT 0
+    invite_email_success boolean DEFAULT true NOT NULL
 );
 
 CREATE SEQUENCE members_id_seq

lib/gitlab/import_export/project/import_export.yml

@@ -328,9 +328,6 @@ excluded_attributes:
     - :release_id
   project_members:
     - :source_id
-    - :state
-  group_members:
-    - :state
   metrics:
     - :merge_request_id
     - :pipeline_id