Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 24 insertions, 0 deletions

diff --git a/db/migrate/20200630091656_add_bio_html_to_user_details.rb b/db/migrate/20200630091656_add_bio_html_to_user_details.rb
new file mode 100644
index 00000000000..6a9df85d6a4
--- /dev/null
+++ b/db/migrate/20200630091656_add_bio_html_to_user_details.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class AddBioHtmlToUserDetails < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      # Note: bio_html is calculated from bio, the bio column is already constrained
+      add_column :user_details, :bio_html, :text # rubocop:disable Migration/AddLimitToTextColumns
+      add_column :user_details, :cached_markdown_version, :integer
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :user_details, :bio_html
+      remove_column :user_details, :cached_markdown_version
+    end
+  end
+end