[Railties] require_relative => require

This basically reverts 618268b4b9382f4bcf004a945fe2d85c0bd03e32

9 files changed, 15 insertions, 15 deletions

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 23fdf03b05..39ef0d62de 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../../app_base"
+require "rails/generators/app_base"
 
 module Rails
   module ActionMethods # :nodoc:
@@ -161,7 +161,7 @@ module Rails
     def master_key
       return if options[:pretend]
 
-      require_relative "../master_key/master_key_generator"
+      require "rails/generators/rails/master_key/master_key_generator"
 
       after_bundle do
         Rails::Generators::MasterKeyGenerator.new([], quiet: options[:quiet]).add_master_key_file
@@ -171,7 +171,7 @@ module Rails
     def credentials
       return if options[:pretend]
 
-      require_relative "../credentials/credentials_generator"
+      require "rails/generators/rails/credentials/credentials_generator"
 
       after_bundle do
         Rails::Generators::CredentialsGenerator.new([], quiet: options[:quiet]).add_credentials_file_silently
@@ -559,7 +559,7 @@ module Rails
 
         def handle_version_request!(argument)
           if ["--version", "-v"].include?(argument)
-            require_relative "../../../version"
+            require "rails/version"
             puts "Rails #{Rails::VERSION::STRING}"
             exit(0)
           end
diff --git a/railties/lib/rails/generators/rails/credentials/credentials_generator.rb b/railties/lib/rails/generators/rails/credentials/credentials_generator.rb
index 21ca566818..52cb4bd8bf 100644
--- a/railties/lib/rails/generators/rails/credentials/credentials_generator.rb
+++ b/railties/lib/rails/generators/rails/credentials/credentials_generator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../../base"
-require_relative "../master_key/master_key_generator"
+require "rails/generators/base"
+require "rails/generators/rails/master_key/master_key_generator"
 require "active_support/encrypted_configuration"
 
 module Rails
diff --git a/railties/lib/rails/generators/rails/encrypted_secrets/encrypted_secrets_generator.rb b/railties/lib/rails/generators/rails/encrypted_secrets/encrypted_secrets_generator.rb
index d054e8cad2..1aa7a2622a 100644
--- a/railties/lib/rails/generators/rails/encrypted_secrets/encrypted_secrets_generator.rb
+++ b/railties/lib/rails/generators/rails/encrypted_secrets/encrypted_secrets_generator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../../base"
-require_relative "../../../secrets"
+require "rails/generators/base"
+require "rails/secrets"
 
 module Rails
   module Generators
diff --git a/railties/lib/rails/generators/rails/master_key/master_key_generator.rb b/railties/lib/rails/generators/rails/master_key/master_key_generator.rb
index 395687974a..23dbed20ac 100644
--- a/railties/lib/rails/generators/rails/master_key/master_key_generator.rb
+++ b/railties/lib/rails/generators/rails/master_key/master_key_generator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../../base"
+require "rails/generators/base"
 require "pathname"
 require "active_support/encrypted_file"
 
diff --git a/railties/lib/rails/generators/rails/model/model_generator.rb b/railties/lib/rails/generators/rails/model/model_generator.rb
index 1dca03e0bb..de4de2cae2 100644
--- a/railties/lib/rails/generators/rails/model/model_generator.rb
+++ b/railties/lib/rails/generators/rails/model/model_generator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../../model_helpers"
+require "rails/generators/model_helpers"
 
 module Rails
   module Generators
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index eb941adf95..d0dfb04162 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/hash/slice"
-require_relative "../app/app_generator"
+require "rails/generators/rails/app/app_generator"
 require "date"
 
 module Rails
diff --git a/railties/lib/rails/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb
index 74b1574863..3ba25ef0fe 100644
--- a/railties/lib/rails/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../../resource_helpers"
-require_relative "../model/model_generator"
+require "rails/generators/resource_helpers"
+require "rails/generators/rails/model/model_generator"
 
 module Rails
   module Generators
diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
index c0fb873d36..8beb7416c0 100644
--- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../resource/resource_generator"
+require "rails/generators/rails/resource/resource_generator"
 
 module Rails
   module Generators
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
index 601a4b3a6e..7030561a33 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../../resource_helpers"
+require "rails/generators/resource_helpers"
 
 module Rails
   module Generators