diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-06-03 10:26:19 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-03 20:04:50 +0000 |
| commit | b1ea0cc41bbf89c946e8811fb7f3082f58ea1586 (patch) | |
| tree | a8564d39f91e1e50ef093d4c0f009fe1a8440768 | |
| parent | 6953b13c060fc6df56339692eb4acb8122193d03 (diff) | |
| download | gitlab-ce-11-11-stable-patch-2.tar.gz | |
Merge branch 'sh-fix-issue-58714' into 'master'11-11-stable-patch-2
Fix migration failure when groups are missing route
Closes #58714
See merge request gitlab-org/gitlab-ce!29022
(cherry picked from commit 0488c26ec6d10b943999b7fb61ca7209ab2c275e)
a52cbf6b Fix migration failure when groups are missing route
| -rw-r--r-- | changelogs/unreleased/sh-fix-issue-58714.yml | 5 | ||||
| -rw-r--r-- | db/migrate/20180702134423_generate_missing_routes.rb | 1 | ||||
| -rw-r--r-- | spec/migrations/generate_missing_routes_spec.rb | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-fix-issue-58714.yml b/changelogs/unreleased/sh-fix-issue-58714.yml new file mode 100644 index 00000000000..597a011b6f3 --- /dev/null +++ b/changelogs/unreleased/sh-fix-issue-58714.yml @@ -0,0 +1,5 @@ +--- +title: Fix migration failure when groups are missing route +merge_request: 29022 +author: +type: fixed diff --git a/db/migrate/20180702134423_generate_missing_routes.rb b/db/migrate/20180702134423_generate_missing_routes.rb index a440bc3179c..dd1106c9e6a 100644 --- a/db/migrate/20180702134423_generate_missing_routes.rb +++ b/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 diff --git a/spec/migrations/generate_missing_routes_spec.rb b/spec/migrations/generate_missing_routes_spec.rb index 32515d353b0..30ad135d4df 100644 --- a/spec/migrations/generate_missing_routes_spec.rb +++ b/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', |