diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-10-21 22:08:33 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2017-10-21 22:48:26 +0900 |
| commit | 6a728491b66340345a91264b5983ad81944ab97a (patch) | |
| tree | 7993335bc63d5d0a03d8f7863b29f9b333bbd2cb /railties/lib/rails/generators/erb | |
| parent | 01ae39660243bc5f0a986e20f9c9bff312b1b5f8 (diff) | |
| download | rails-6a728491b66340345a91264b5983ad81944ab97a.tar.gz rails-6a728491b66340345a91264b5983ad81944ab97a.tar.bz2 rails-6a728491b66340345a91264b5983ad81944ab97a.zip | |
[Railties] require_relative => require
This basically reverts 618268b4b9382f4bcf004a945fe2d85c0bd03e32
Diffstat (limited to 'railties/lib/rails/generators/erb')
3 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb index 1a6c84288b..8e13744b2a 100644 --- a/railties/lib/rails/generators/erb/controller/controller_generator.rb +++ b/railties/lib/rails/generators/erb/controller/controller_generator.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "../../erb" +require "rails/generators/erb" module Erb # :nodoc: module Generators # :nodoc: diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb index 5774d86c8e..e2ea66415f 100644 --- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "../../erb" +require "rails/generators/erb" module Erb # :nodoc: module Generators # :nodoc: diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb index e80c6d4b7d..2fc04e4094 100644 --- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require_relative "../../erb" -require_relative "../../resource_helpers" +require "rails/generators/erb" +require "rails/generators/resource_helpers" module Erb # :nodoc: module Generators # :nodoc: |