Merge branch 'zeitwerk' into uuid

# Conflicts: # lib/active_graph/version.rb
neo4jrb · Jan 1, 2024 · 89ba79b · 89ba79b
2 parents 2c1cd1b + 3bf8aa8
commit 89ba79b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/lib/active_graph/railtie.rb b/lib/active_graph/railtie.rb
@@ -1,16 +1,13 @@
+# Need the action_dispatch railtie to have action_dispatch.rescue_responses initialized correctly
+require 'action_dispatch/railtie'
+require 'rails/generators'
+require 'rails/generators/active_model'
+require 'rails/generators/named_base'
+require 'rails/railtie'
+require File.expand_path('../rails/generators/migration_helper.rb', __dir__)
+Rails::Generators::GeneratedAttribute.include ActiveGraph::Generators::GeneratedAttribute
 require 'active_graph'
 
-if defined?(Rails)
-  # Need the action_dispatch railtie to have action_dispatch.rescue_responses initialized correctly
-  require 'action_dispatch/railtie'
-  require 'rails/generators'
-  require 'rails/generators/active_model'
-  require 'rails/generators/named_base'
-  require 'rails/railtie'
-  require File.expand_path('../rails/generators/migration_helper.rb', __dir__)
-  Rails::Generators::GeneratedAttribute.include ActiveGraph::Generators::GeneratedAttribute
-end
-
 module ActiveGraph
   class Railtie < ::Rails::Railtie
     def empty_config

diff --git a/lib/active_graph/version.rb b/lib/active_graph/version.rb
@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '12.0.0.beta.1'
+  VERSION = '12.0.0.beta.2'
 end