From 40bdbce191ad90dfea43dad51fac5c4726b89392 Mon Sep 17 00:00:00 2001
From: bogdanvlviv <bogdanvlviv@gmail.com>
Date: Mon, 15 May 2017 14:17:28 +0000
Subject: Define path with __dir__

".. with __dir__ we can restore order in the Universe." - by @fxn

Related to 5b8738c2df003a96f0e490c43559747618d10f5f
---
 railties/lib/rails/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails/engine.rb')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index dc0b158bd4..2732485c5a 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -40,7 +40,7 @@ module Rails
   #
   #   class MyEngine < Rails::Engine
   #     # Add a load path for this specific Engine
-  #     config.autoload_paths << File.expand_path("../lib/some/path", __FILE__)
+  #     config.autoload_paths << File.expand_path("lib/some/path", __dir__)
   #
   #     initializer "my_engine.add_middleware" do |app|
   #       app.middleware.use MyEngine::Middleware
-- 
cgit v1.2.3


From 618268b4b9382f4bcf004a945fe2d85c0bd03e32 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 30 Jun 2017 13:55:31 +0900
Subject: [Railties] require => require_relative

---
 railties/lib/rails/engine.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'railties/lib/rails/engine.rb')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 2732485c5a..a80593d4b9 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -1,5 +1,5 @@
-require "rails/railtie"
-require "rails/engine/railties"
+require_relative "railtie"
+require_relative "engine/railties"
 require "active_support/core_ext/module/delegation"
 require "pathname"
 require "thread"
@@ -437,8 +437,8 @@ module Rails
     # Load console and invoke the registered hooks.
     # Check <tt>Rails::Railtie.console</tt> for more info.
     def load_console(app = self)
-      require "rails/console/app"
-      require "rails/console/helpers"
+      require_relative "console/app"
+      require_relative "console/helpers"
       run_console_blocks(app)
       self
     end
@@ -461,7 +461,7 @@ module Rails
     # Load Rails generators and invoke the registered hooks.
     # Check <tt>Rails::Railtie.generators</tt> for more info.
     def load_generators(app = self)
-      require "rails/generators"
+      require_relative "generators"
       run_generators_blocks(app)
       Rails::Generators.configure!(app.config.generators)
       self
-- 
cgit v1.2.3