Merge branch '332592-add-state-to-members' into 'master'

Add state column to members table

See merge request gitlab-org/gitlab!66550

db/migrate/20210721145029_add_state_to_members.rb

+# frozen_string_literal: true
+
+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
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :members, :state
+    end
+  end
+end

db/schema_migrations/20210721145029

+1585d2912058ce3a9225233c23707a3679a3f8df2078c71b5cc48f28b7bb9392
\ No newline at end of file

db/structure.sql

@@ -14707,7 +14707,8 @@ CREATE TABLE members (
     requested_at timestamp without time zone,
     expires_at date,
     ldap boolean DEFAULT false NOT NULL,
-    override boolean DEFAULT false NOT NULL
+    override boolean DEFAULT false NOT NULL,
+    state smallint DEFAULT 0
 );
 
 CREATE SEQUENCE members_id_seq

lib/gitlab/import_export/project/import_export.yml

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