diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-17 07:10:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 07:10:27 -0600 |
| commit | 404eceba8c8f0951407c2508567f6abefec76e4c (patch) | |
| tree | cb8c690084083b6aee4a70ad29c24c0050f88bed /railties/lib/rails/generators/css | |
| parent | e505bc8acd4448030fd4d2f85796bdb61d45a5b1 (diff) | |
| parent | fbade51248ea48db87703ba7418badbd3ed85e36 (diff) | |
| download | rails-404eceba8c8f0951407c2508567f6abefec76e4c.tar.gz rails-404eceba8c8f0951407c2508567f6abefec76e4c.tar.bz2 rails-404eceba8c8f0951407c2508567f6abefec76e4c.zip | |
Merge branch 'master' into make-reverse-merge-bang-order-consistent
Diffstat (limited to 'railties/lib/rails/generators/css')
| -rw-r--r-- | railties/lib/rails/generators/css/assets/assets_generator.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/css/scaffold/scaffold_generator.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/css/assets/assets_generator.rb b/railties/lib/rails/generators/css/assets/assets_generator.rb index 20baf31a34..40f3bb3c70 100644 --- a/railties/lib/rails/generators/css/assets/assets_generator.rb +++ b/railties/lib/rails/generators/css/assets/assets_generator.rb @@ -1,9 +1,9 @@ -require "rails/generators/named_base" +require_relative "../../named_base" module Css # :nodoc: module Generators # :nodoc: class AssetsGenerator < Rails::Generators::NamedBase # :nodoc: - source_root File.expand_path("../templates", __FILE__) + source_root File.expand_path("templates", __dir__) def copy_stylesheet copy_file "stylesheet.css", File.join("app/assets/stylesheets", class_path, "#{file_name}.css") diff --git a/railties/lib/rails/generators/css/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/css/scaffold/scaffold_generator.rb index cf534030f9..b8c72828a1 100644 --- a/railties/lib/rails/generators/css/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/css/scaffold/scaffold_generator.rb @@ -1,4 +1,4 @@ -require "rails/generators/named_base" +require_relative "../../named_base" module Css # :nodoc: module Generators # :nodoc: |