summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2018-09-11 18:41:14 -0700
committerDJ Mountney <david@twkie.net>2018-09-11 18:41:14 -0700
commit76cfe4f1fdadf0b4e43d066ffccbe34fbfcb9a80 (patch)
treee955231d7515168788b6a6872f774e05fd84491e /config
parentf6097cbfaa1fae7cceef583bb3dbbd85286c80c2 (diff)
downloadgitlab-ce-76cfe4f1fdadf0b4e43d066ffccbe34fbfcb9a80.tar.gz
Ensure the schema is loaded with post_migrations included
If doing a schema load, the post_migrations should also be marked as up, even if SKIP_POST_DEPLOYMENT_MIGRATIONS was set, otherwise future migration runs will be broken.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/0_post_deployment_migrations.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/config/initializers/0_post_deployment_migrations.rb b/config/initializers/0_post_deployment_migrations.rb
index 3d81b869b52..2d647f72840 100644
--- a/config/initializers/0_post_deployment_migrations.rb
+++ b/config/initializers/0_post_deployment_migrations.rb
@@ -1,14 +1,4 @@
# Post deployment migrations are included by default. This file must be loaded
# before other initializers as Rails may otherwise memoize a list of migrations
# excluding the post deployment migrations.
-unless ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS']
- Rails.application.config.paths['db'].each do |db_path|
- path = Rails.root.join(db_path, 'post_migrate').to_s
-
- Rails.application.config.paths['db/migrate'] << path
-
- # Rails memoizes migrations at certain points where it won't read the above
- # path just yet. As such we must also update the following list of paths.
- ActiveRecord::Migrator.migrations_paths << path
- end
-end
+Gitlab::Database.add_post_migrate_path_to_rails