fix merge

zombocom · Nov 13, 2014 · 2aa82a6 · 2aa82a6
1 parent 0ce0bec
commit 2aa82a6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/derailed_benchmarks/tasks.rb b/lib/derailed_benchmarks/tasks.rb
@@ -19,14 +19,14 @@
 
     DERAILED_APP = Rails.application
 
-    if APP.respond_to?(:initialized?)
-      APP.initialize! unless APP.initialized?
+    if DERAILED_APP.respond_to?(:initialized?)
+      DERAILED_APP.initialize! unless DERAILED_APP.initialized?
     else
-      APP.initialize! unless APP.instance_variable_get(:@initialized)
+      DERAILED_APP.initialize! unless DERAILED_APP.instance_variable_get(:@initialized)
     end
 
     if defined? ActiveRecord
-      ActiveRecord::Migrator.migrations_paths = APP.paths['db/migrate'].to_a
+      ActiveRecord::Migrator.migrations_paths = DERAILED_APP.paths['db/migrate'].to_a
       ActiveRecord::Migration.verbose = true
       ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, nil)
     end