diff options
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb | 1 | ||||
-rw-r--r-- | railties/lib/rails/tasks/yarn.rake | 4 |
2 files changed, 2 insertions, 3 deletions
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 4cc1e2d0fd..cf97c22160 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 @@ -20,7 +20,6 @@ module Rails template template_file, File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb") end - hook_for :template_engine, as: :scaffold do |template_engine| invoke template_engine unless options.api? end diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake index bb99d38fde..7c5e266e3e 100644 --- a/railties/lib/rails/tasks/yarn.rake +++ b/railties/lib/rails/tasks/yarn.rake @@ -1,9 +1,9 @@ namespace :yarn do desc "Install all JavaScript dependencies as specified via Yarn" task :install do - system('./bin/yarn install') + system("./bin/yarn install") end end # Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use. -Rake::Task['assets:precompile'].enhance [ 'yarn:install' ] +Rake::Task["assets:precompile"].enhance [ "yarn:install" ] |