Merge branch '3094-move-ee-migrations-to-ee-folder' into 'master'

Move EE-specific migrations under ee/db/

Closes #3094

See merge request gitlab-org/gitlab-ee!3831

.rubocop.yml

@@ -13,11 +13,24 @@ AllCops:
     - 'db/*'
     - 'db/fixtures/**/*'
     - 'db/geo/*'
+    - 'ee/db/geo/*'
     - 'tmp/**/*'
     - 'bin/**/*'
     - 'generator_templates/**/*'
     - 'builds/**/*'
 
+# This cop checks whether some constant value isn't a
+# mutable literal (e.g. array or hash).
+Style/MutableConstant:
+  Enabled: true
+  Exclude:
+    - 'db/migrate/**/*'
+    - 'db/post_migrate/**/*'
+    - 'db/geo/migrate/**/*'
+    - 'ee/db/migrate/**/*'
+    - 'ee/db/post_migrate/**/*'
+    - 'ee/db/geo/migrate/**/*'
+
 # Gitlab ###################################################################
 
 Gitlab/ModuleWithInstanceVariables:

config/initializers/0_post_deployment_migrations.rb

@@ -12,3 +12,12 @@ unless ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS']
     ActiveRecord::Migrator.migrations_paths << path
   end
 end
+
+migrate_paths = Rails.application.config.paths['db/migrate'].to_a
+migrate_paths.each do |migrate_path|
+  absolute_migrate_path = Pathname.new(migrate_path).realpath(Rails.root)
+  ee_migrate_path = Rails.root.join('ee/', absolute_migrate_path.relative_path_from(Rails.root))
+
+  Rails.application.config.paths['db/migrate'] << ee_migrate_path.to_s
+  ActiveRecord::Migrator.migrations_paths << ee_migrate_path.to_s
+end

doc/development/geo.md

@@ -167,7 +167,7 @@ otherwise it may fail with an encryption error.
 Secondary Geo nodes track data about what has been downloaded in a second
 PostgreSQL database that is distinct from the production GitLab database.
 The database configuration is set in `config/database_geo.yml`.
-`db/geo` contains the schema and migrations for this database.
+`ee/db/geo` contains the schema and migrations for this database.
 
 To write a migration for the database, use the `GeoMigrationGenerator`: