Add latest changes from gitlab-org/gitlab@master

5 files changed, 40 insertions, 1 deletions

diff --git a/db/migrate/20210603140302_add_pronouns_to_user_details.rb b/db/migrate/20210603140302_add_pronouns_to_user_details.rb
new file mode 100644
index 00000000000..f28d45bdf6f
--- /dev/null
+++ b/db/migrate/20210603140302_add_pronouns_to_user_details.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddPronounsToUserDetails < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    # rubocop:disable Migration/AddLimitToTextColumns
+    # limit is added in 20210607050531_add_text_limit_to_user_details_pronouns
+    with_lock_retries do
+      add_column :user_details, :pronouns, :text, null: true
+    end
+    # rubocop:enable Migration/AddLimitToTextColumns
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :user_details, :pronouns
+    end
+  end
+end
diff --git a/db/migrate/20210607050531_add_text_limit_to_user_details_pronouns.rb b/db/migrate/20210607050531_add_text_limit_to_user_details_pronouns.rb
new file mode 100644
index 00000000000..41c543e5deb
--- /dev/null
+++ b/db/migrate/20210607050531_add_text_limit_to_user_details_pronouns.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddTextLimitToUserDetailsPronouns < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :user_details, :pronouns, 50
+  end
+
+  def down
+    remove_text_limit :user_details, :pronouns
+  end
+end
diff --git a/db/schema_migrations/20210603140302 b/db/schema_migrations/20210603140302
new file mode 100644
index 00000000000..346cf84c85c
--- /dev/null
+++ b/db/schema_migrations/20210603140302
@@ -0,0 +1 @@
+5b58dbdcba08f6e56802aa58ba0d23e5353c1818a8d4d653d53dabaac4c0234c
\ No newline at end of file
diff --git a/db/schema_migrations/20210607050531 b/db/schema_migrations/20210607050531
new file mode 100644
index 00000000000..e69ab586f4d
--- /dev/null
+++ b/db/schema_migrations/20210607050531
@@ -0,0 +1 @@
+77f24cb4756dfeef16ba48a189d3bf9352534f858446522bc49495b9295374a8
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index d0afdcf5cd8..f02f9f50d08 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -18551,8 +18551,10 @@ CREATE TABLE user_details (
     webauthn_xid text,
     other_role text,
     provisioned_by_group_id bigint,
+    pronouns text,
     CONSTRAINT check_245664af82 CHECK ((char_length(webauthn_xid) <= 100)),
-    CONSTRAINT check_b132136b01 CHECK ((char_length(other_role) <= 100))
+    CONSTRAINT check_b132136b01 CHECK ((char_length(other_role) <= 100)),
+    CONSTRAINT check_eeeaf8d4f0 CHECK ((char_length(pronouns) <= 50))
 );
 
 CREATE SEQUENCE user_details_user_id_seq