lib/neo4j/railtie.rb in neo4j-8.0.0.alpha.4 vs lib/neo4j/railtie.rb in neo4j-8.0.0.alpha.5

@@ -52,10 +52,12 @@
       Neo4j::Config[:logger] ||= Rails.logger
 
       session_types = cfg.sessions.map { |session_opts| session_opts[:type] }
 
       register_neo4j_cypher_logging(session_types)
-      Neo4j::Migrations.check_for_pending_migrations! if Rails.env.development? && Neo4j::Config.fail_on_pending_migrations
+      if Rails.env.development? && !Neo4j::Migrations.currently_running_migrations && Neo4j::Config.fail_on_pending_migrations
+        Neo4j::Migrations.check_for_pending_migrations!
+      end
     end
 
     TYPE_SUBSCRIBERS = {
       http: Neo4j::Core::CypherSession::Adaptors::HTTP.method(:subscribe_to_request),
       bolt: Neo4j::Core::CypherSession::Adaptors::Bolt.method(:subscribe_to_request),