Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 0 deletions

diff --git a/db/migrate/20211112155416_populate_default_value_for_personal_access_tokens_prefix.rb b/db/migrate/20211112155416_populate_default_value_for_personal_access_tokens_prefix.rb
new file mode 100644
index 00000000000..8dd23e1a72e
--- /dev/null
+++ b/db/migrate/20211112155416_populate_default_value_for_personal_access_tokens_prefix.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class PopulateDefaultValueForPersonalAccessTokensPrefix < Gitlab::Database::Migration[1.0]
+  def up
+    execute(
+      <<-SQL
+      UPDATE
+        application_settings
+      SET
+        personal_access_token_prefix = default
+      WHERE
+        personal_access_token_prefix IS NULL
+      SQL
+    )
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/schema_migrations/20211112155416 b/db/schema_migrations/20211112155416
new file mode 100644
index 00000000000..91037c578a7
--- /dev/null
+++ b/db/schema_migrations/20211112155416
@@ -0,0 +1 @@
+0c5627518093f6261679940402cbd756a91bf4617a37eecdbbc82dc57856dcec
\ No newline at end of file