diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-12-10 12:41:13 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-10 12:41:13 +1030 |
| commit | 5a5474325f38d892f182fef479ed0ee4e8835cfa (patch) | |
| tree | ca11dd9411e1ca57a464eacb0c72c1e32cb1cef9 /railties/lib | |
| parent | c16296c79556ac660a0d7bd2df95e348a9e8df31 (diff) | |
| parent | c2c840fa6b66a43959901235ca7b3995528e4dac (diff) | |
| download | rails-5a5474325f38d892f182fef479ed0ee4e8835cfa.tar.gz rails-5a5474325f38d892f182fef479ed0ee4e8835cfa.tar.bz2 rails-5a5474325f38d892f182fef479ed0ee4e8835cfa.zip | |
Merge pull request #27320 from y-yagi/run_webpack_command_only_when_webpack_option_is_specified
run `webpack` command only when webpack option is specified
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 578aa23513..576c36fc86 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -426,7 +426,7 @@ module Rails end def run_webpack - rails_command "webpacker:install" + rails_command "webpacker:install" if options[:webpack] end def generate_spring_binstubs |