Merge remote-tracking branch 'origin/11-11-stable-patch-2' into 11-11-stable-patch-1

changelogs/unreleased/sh-fix-issue-58714.yml

+---
+title: Fix migration failure when groups are missing route
+merge_request: 29022
+author:
+type: fixed

db/migrate/20180702134423_generate_missing_routes.rb

@@ -98,6 +98,7 @@ class GenerateMissingRoutes < ActiveRecord::Migration[4.2]
 
   class Namespace < ActiveRecord::Base
     self.table_name = 'namespaces'
+    self.inheritance_column = :_type_disabled
 
     include EachBatch
     include GenerateMissingRoutes::Routable

spec/migrations/generate_missing_routes_spec.rb

@@ -8,7 +8,7 @@ describe GenerateMissingRoutes, :migration do
     let(:routes) { table(:routes) }
 
     it 'creates routes for projects without a route' do
-      namespace = namespaces.create!(name: 'GitLab', path: 'gitlab')
+      namespace = namespaces.create!(name: 'GitLab', path: 'gitlab', type: 'Group')
 
       routes.create!(
         path: 'gitlab',