diff options
author | Matthew Draper <matthew@trebex.net> | 2018-07-25 04:10:29 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-25 04:10:29 +0930 |
commit | ec387c6dd975fecea69db2ed9ff0c090ac59cf83 (patch) | |
tree | b3720e23e2f1832c894f75a167a57bcf4ef5259b /railties/lib/rails/generators | |
parent | 48c287d1963fba09cf620527d35519f67d5ca01a (diff) | |
parent | 2e194d0c9edfa54cb955b48fa204de2f4c980239 (diff) | |
download | rails-ec387c6dd975fecea69db2ed9ff0c090ac59cf83.tar.gz rails-ec387c6dd975fecea69db2ed9ff0c090ac59cf83.tar.bz2 rails-ec387c6dd975fecea69db2ed9ff0c090ac59cf83.zip |
Merge pull request #33229 from albertoalmagro/albertoalmagro/prefer-rails-command-over-bin-rails
Prefer rails command over bin/rails
Diffstat (limited to 'railties/lib/rails/generators')
3 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index e25ddcf548..d5d87f3dfd 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -249,7 +249,7 @@ module Rails add_shared_options_for "application" - # Add bin/rails options + # Add rails command options class_option :version, type: :boolean, aliases: "-v", group: :rails, desc: "Show Rails version number and quit" diff --git a/railties/lib/rails/generators/rails/app/templates/bin/update.tt b/railties/lib/rails/generators/rails/app/templates/bin/update.tt index 70cc71d83b..99c2430bc6 100644 --- a/railties/lib/rails/generators/rails/app/templates/bin/update.tt +++ b/railties/lib/rails/generators/rails/app/templates/bin/update.tt @@ -23,12 +23,12 @@ chdir APP_ROOT do <% unless options.skip_active_record? -%> puts "\n== Updating database ==" - system! 'bin/rails db:migrate' + system! 'rails db:migrate' <% end -%> puts "\n== Removing old logs and tempfiles ==" - system! 'bin/rails log:clear tmp:clear' + system! 'rails log:clear tmp:clear' puts "\n== Restarting application server ==" - system! 'bin/rails restart' + system! 'rails restart' end diff --git a/railties/lib/rails/generators/rails/credentials/credentials_generator.rb b/railties/lib/rails/generators/rails/credentials/credentials_generator.rb index 719e0c1e4c..99b935aa6a 100644 --- a/railties/lib/rails/generators/rails/credentials/credentials_generator.rb +++ b/railties/lib/rails/generators/rails/credentials/credentials_generator.rb @@ -20,7 +20,7 @@ module Rails add_credentials_file_silently(template) - say "You can edit encrypted credentials with `bin/rails credentials:edit`." + say "You can edit encrypted credentials with `rails credentials:edit`." say "" end end |