aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2018-08-11 21:14:54 +0200
committerGitHub <noreply@github.com>2018-08-11 21:14:54 +0200
commit317efa5c3593b70e9cc9a2fcb67488a302b71731 (patch)
tree49c2a2494d85f65914a4bb0cf7df7e3af383c949 /railties/lib
parent76b3c18558b025c111a5e34d3cd39e488eaa5802 (diff)
parent2c667814c8ea47a5e73b60a2bd846bd31fef3a32 (diff)
downloadrails-317efa5c3593b70e9cc9a2fcb67488a302b71731.tar.gz
rails-317efa5c3593b70e9cc9a2fcb67488a302b71731.tar.bz2
rails-317efa5c3593b70e9cc9a2fcb67488a302b71731.zip
Merge pull request #33587 from bogdanvlviv/follow-up-33202
`bundle binstubs bundler` should be executed after `bundle install`
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index dd6ec127dc..a6d160f1eb 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -298,8 +298,6 @@ module Rails
build(:bin)
end
- public_task :generate_bundler_binstub
-
def update_bin_files
build(:bin_when_updating)
end
@@ -471,7 +469,8 @@ module Rails
end
public_task :apply_rails_template, :run_bundle
- public_task :run_webpack, :generate_spring_binstubs
+ public_task :generate_bundler_binstub, :generate_spring_binstubs
+ public_task :run_webpack
def run_after_bundle_callbacks
@after_bundle_callbacks.each(&:call)