Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 24 insertions, 0 deletions

diff --git a/db/post_migrate/20201102112206_rename_sitemap_namespace.rb b/db/post_migrate/20201102112206_rename_sitemap_namespace.rb
new file mode 100644
index 00000000000..b2e610d68db
--- /dev/null
+++ b/db/post_migrate/20201102112206_rename_sitemap_namespace.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class RenameSitemapNamespace < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+  include Gitlab::Database::RenameReservedPathsMigration::V1
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  # We're taking over the /sitemap namespace
+  # since it's necessary for the default behavior of Sitemaps
+  def up
+    disable_statement_timeout do
+      rename_root_paths(['sitemap'])
+    end
+  end
+
+  def down
+    disable_statement_timeout do
+      revert_renames
+    end
+  end
+end