diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 14:37:35 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-01 14:37:35 +0000 |
| commit | 57c068e169381565488d9430431a7202399507f0 (patch) | |
| tree | 16c55c13b308207d9ffa4b78e6e59d5950bb44ca | |
| parent | 135b6e5e613d153811fb386f455d6901c6d64744 (diff) | |
| parent | 2f40fc521e572fb4043cfa5e57616b4e5214033a (diff) | |
| download | gitlab-ce-57c068e169381565488d9430431a7202399507f0.tar.gz | |
Merge branch '28850-fix-broken-migration' into 'master'
Disable the inheritance column of services in DisableInvalidServiceTemplates migration
Closes #28850
See merge request !9613
| -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 |