kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '28850-fix-broken-migration' into 'master'

Browse source 
Disable the inheritance column of services in DisableInvalidServiceTemplates migration

Closes #28850

See merge request !9613
This commit is contained in:
Sean McGivern 2017-03-01 14:37:35 +00:00
commit 57c068e169
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelogs/unreleased/28850-fix-broken-migration.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Fix broken migration when upgrading straight to 8.17.1
merge_request: 9613
author:

6
db/post_migrate/20170211073944_disable_invalid_service_templates.rb
View file

@ -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