diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-18 15:44:17 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-18 15:44:17 +0300 |
| commit | 88442e02e744f730282b5d9eec93b8dd1c1768bb (patch) | |
| tree | 74fa2639d2600b4f9d28091bdea491abc267bfd0 /lib/gitlab | |
| parent | 3df1a7336deb33c9ea0342957c64c7b7fd22956a (diff) | |
| parent | 75946b40358b6ba2e96eb8ec300fd8d05d81fd09 (diff) | |
Merge branch 'blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespace' into 'master'
Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Namespace"
Closes #48014
See merge request gitlab-org/gitlab-ce!19918
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb index 62d4d0a92a6..26ae6966746 100644 --- a/lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb +++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/migration_classes.rb @@ -37,6 +37,7 @@ module Gitlab class Namespace < ActiveRecord::Base include MigrationClasses::Routable self.table_name = 'namespaces' + self.inheritance_column = :_type_disabled belongs_to :parent, class_name: "#{MigrationClasses.name}::Namespace" has_one :route, as: :source |