Merge branch 'issue_50980' into 'master'

Disable statement timeout in RenameLoginRootNamespaces migration

Closes #50980

See merge request gitlab-org/gitlab-ce!21564

db/post_migrate/20180816193530_rename_login_root_namespaces.rb

@@ -7,10 +7,14 @@ class RenameLoginRootNamespaces < ActiveRecord::Migration
 
   # We're taking over the /login namespace as part of a fix for the Jira integration
   def up
+    disable_statement_timeout do
       rename_root_paths 'login'
     end
+  end
 
   def down
+    disable_statement_timeout do
       revert_renames
     end
+  end
 end