aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/app_loader.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/railties/lib/rails/app_loader.rb b/railties/lib/rails/app_loader.rb
index 3dc4fe5414..a5d22fa9bc 100644
--- a/railties/lib/rails/app_loader.rb
+++ b/railties/lib/rails/app_loader.rb
@@ -10,13 +10,19 @@ module Rails
BUNDLER_WARNING = <<EOS
Looks like your app's ./bin/rails is a stub that was generated by Bundler.
-In Rails #{Rails::VERSION::MAJOR}, your app's bin/ directory contains executables that are versioned
+Beginning In Rails 4, your app's bin/ directory contains executables that are versioned
like any other source code, rather than stubs that are generated on demand.
-Here's how to upgrade:
+If your application was created in Rails 4+, you might be seeing this message
+if your bundle install command is using the --binstubs option and thereby overriding the
+standard Rails bin/rails binstub. You might need to stop using the --binstubs option,
+or at least ensure that it is using a path other than ./bin. You may need to coordinate
+this change with your environment's PATH.
+
+If your application was created prior to Rails 4, here's how to upgrade:
bundle config --delete bin # Turn off Bundler's stub generator
- rails app:update:bin # Use the new Rails 5 executables
+ rails app:update:bin # Use the new Rails executables
git add bin # Add bin/ to source control
You may need to remove bin/ from your .gitignore as well.