diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-01 11:26:44 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-01 14:06:50 +0100 |
| commit | 2f40fc521e572fb4043cfa5e57616b4e5214033a (patch) | |
| tree | 0b05a291a3c1547fa2e0425549b8b18d9cf19a99 | |
| parent | 11dd2348c410949c98adfc10cdcf5be787742179 (diff) | |
| download | gitlab-ce-2f40fc521e572fb4043cfa5e57616b4e5214033a.tar.gz | |
Disable the inheritance column of services in DisableInvalidServiceTemplates migration
The `unless defined?(Service)` was useless since in production env,
models are eager loaded, thus we wouldn't disable the STI, resulting in
the following error:
The single-table inheritance mechanism failed to locate the subclass:
'GitlabCiService'. This error is raised because the column 'type' is
reserved for storing the class in case of inheritance. Please rename
this column if you didn't intend it to be used for storing the
inheritance class or overwrite Service.inheritance_column to use another
column for that
information./opt/gitlab/embedded/service/gitlab-rails/db/post_migrate/20170211073944_disable_invalid_service_templates.rb:11:in `up'
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | changelogs/unreleased/28850-fix-broken-migration.yml | 4 | ||||
| -rw-r--r-- | db/post_migrate/20170211073944_disable_invalid_service_templates.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/changelogs/unreleased/28850-fix-broken-migration.yml b/changelogs/unreleased/28850-fix-broken-migration.yml new file mode 100644 index 00000000000..7f59a7708bc --- /dev/null +++ b/changelogs/unreleased/28850-fix-broken-migration.yml @@ -0,0 +1,4 @@ +--- +title: Fix broken migration when upgrading straight to 8.17.1 +merge_request: 9613 +author: diff --git a/db/post_migrate/20170211073944_disable_invalid_service_templates.rb b/db/post_migrate/20170211073944_disable_invalid_service_templates.rb index 84954b1ef64..603efc43782 100644 --- a/db/post_migrate/20170211073944_disable_invalid_service_templates.rb +++ b/db/post_migrate/20170211073944_disable_invalid_service_templates.rb @@ -1,10 +1,8 @@ class DisableInvalidServiceTemplates < ActiveRecord::Migration DOWNTIME = false - unless defined?(Service) - class Service < ActiveRecord::Base - self.inheritance_column = nil - end + class Service < ActiveRecord::Base + self.inheritance_column = nil end def up |