Merge branch 'master' into chart.html.haml-refactorchart.html.haml-refactor

* master: (484 commits)
  migrate admin:users:* to static bundle
  correct for missing break statement in dispatcher.js
  alias create and update actions to new and edit
  migrate projects:merge_requests:edit to static bundle
  migrate projects:merge_requests:creations:diffs to static bundle
  migrate projects:merge_requests:creations:new to static bundle
  migrate projects:issues:new and projects:issues:edit to static bundle
  migrate projects:branches:index to static bundle
  migrate projects:branches:new to static bundle
  migrate projects:compare:show to static bundle
  migrate projects:environments:metrics to static bundle
  migrate projects:milestones:* and groups:milestones:* to static bundle
  migrate explore:groups:index to static bundle
  migrate explore:projects:* to static bundle
  migrate dashboard:projects:* to static bundle
  migrate admin:jobs:index to static bundle
  migrate dashboard:todos:index to static bundle
  migrate groups:merge_requests to static bundle
  migrate groups:issues to static bundle
  migrate dashboard:merge_requests to static bundle
  ...

1 files changed, 27 insertions, 10 deletions

diff --git a/spec/support/migrations_helpers.rb b/spec/support/migrations_helpers.rb
index 6522d74ba89..6bf976a2cf9 100644
--- a/spec/support/migrations_helpers.rb
+++ b/spec/support/migrations_helpers.rb
@@ -15,18 +15,27 @@ module MigrationsHelpers
     ActiveRecord::Migrator.migrations(migrations_paths)
   end
 
-  def reset_column_in_migration_models
+  def clear_schema_cache!
     ActiveRecord::Base.connection_pool.connections.each do |conn|
       conn.schema_cache.clear!
     end
+  end
 
-    described_class.constants.sort.each do |name|
-      const = described_class.const_get(name)
+  def reset_column_in_all_models
+    clear_schema_cache!
 
-      if const.is_a?(Class) && const < ActiveRecord::Base
-        const.reset_column_information
-      end
-    end
+    # Reset column information for the most offending classes **after** we
+    # migrated the schema up, otherwise, column information could be
+    # outdated. We have a separate method for this so we can override it in EE.
+    ActiveRecord::Base.descendants.each(&method(:reset_column_information))
+
+    # Without that, we get errors because of missing attributes, e.g.
+    # super: no superclass method `elasticsearch_indexing' for #<ApplicationSetting:0x00007f85628508d8>
+    ApplicationSetting.define_attribute_methods
+  end
+
+  def reset_column_information(klass)
+    klass.reset_column_information
   end
 
   def previous_migration
@@ -36,7 +45,13 @@ module MigrationsHelpers
   end
 
   def migration_schema_version
-    self.class.metadata[:schema] || previous_migration.version
+    metadata_schema = self.class.metadata[:schema]
+
+    if metadata_schema == :latest
+      migrations.last.version
+    else
+      metadata_schema || previous_migration.version
+    end
   end
 
   def schema_migrate_down!
@@ -45,15 +60,17 @@ module MigrationsHelpers
                                      migration_schema_version)
     end
 
-    reset_column_in_migration_models
+    reset_column_in_all_models
   end
 
   def schema_migrate_up!
+    reset_column_in_all_models
+
     disable_migrations_output do
       ActiveRecord::Migrator.migrate(migrations_paths)
     end
 
-    reset_column_in_migration_models
+    reset_column_in_all_models
   end
 
   def disable_migrations_output