diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-08-16 19:47:37 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 19:47:37 +0930 |
| commit | 7c8d50fec1c78c5edcb50503216235b00b2d8fe0 (patch) | |
| tree | 39048bfa5f815b68894f06272a3150d9c816f663 /railties/lib/rails | |
| parent | 0789d093f3473dd9bc95e387cc519072760a6759 (diff) | |
| parent | 7c260ae20170159f85d8b7ded1209f12653934fc (diff) | |
| download | rails-7c8d50fec1c78c5edcb50503216235b00b2d8fe0.tar.gz rails-7c8d50fec1c78c5edcb50503216235b00b2d8fe0.tar.bz2 rails-7c8d50fec1c78c5edcb50503216235b00b2d8fe0.zip | |
Merge pull request #30210 from koic/fix_rubocop_offenses
Fix RuboCop offenses
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/engine/updater.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/framework.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/engine/updater.rb b/railties/lib/rails/engine/updater.rb index 2e0aef8aa7..21a0fc5562 100644 --- a/railties/lib/rails/engine/updater.rb +++ b/railties/lib/rails/engine/updater.rb @@ -9,7 +9,7 @@ module Rails class << self def generator @generator ||= Rails::Generators::PluginGenerator.new ["plugin"], - { engine: true }, destination_root: ENGINE_ROOT + { engine: true }, { destination_root: ENGINE_ROOT } end def run(action) diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake index 0f578fe270..8931aabcda 100644 --- a/railties/lib/rails/tasks/framework.rake +++ b/railties/lib/rails/tasks/framework.rake @@ -11,7 +11,7 @@ namespace :app do template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} require_relative "../generators" require_relative "../generators/rails/app/app_generator" - generator = Rails::Generators::AppGenerator.new [Rails.root], {}, destination_root: Rails.root + generator = Rails::Generators::AppGenerator.new [Rails.root], {}, { destination_root: Rails.root } generator.apply template, verbose: false end |