diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-15 21:17:27 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-15 21:17:27 +0200 |
| commit | aad42dce10a9cc110d67fa03a72ce5b41cbb394a (patch) | |
| tree | 7c22623e9f34f2ff7bfa142385010b6a4e5aea85 /railties/lib/rails/generators/named_base.rb | |
| parent | 92fb8621a623afb33a145b1f3736010a3c870086 (diff) | |
| parent | b6300f3ecc79bff29cf9bb804a30fd92403feac1 (diff) | |
| download | rails-aad42dce10a9cc110d67fa03a72ce5b41cbb394a.tar.gz rails-aad42dce10a9cc110d67fa03a72ce5b41cbb394a.tar.bz2 rails-aad42dce10a9cc110d67fa03a72ce5b41cbb394a.zip | |
Merge branch 'master' into unlock-minitest
Diffstat (limited to 'railties/lib/rails/generators/named_base.rb')
| -rw-r--r-- | railties/lib/rails/generators/named_base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb index aef66adb64..d63a5b0c30 100644 --- a/railties/lib/rails/generators/named_base.rb +++ b/railties/lib/rails/generators/named_base.rb @@ -1,6 +1,6 @@ require "active_support/core_ext/module/introspection" -require "rails/generators/base" -require "rails/generators/generated_attribute" +require_relative "base" +require_relative "generated_attribute" module Rails module Generators |