From 2cc1a64579cca794844288e487bafd89f1351c19 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 15 Aug 2014 13:59:05 +0900 Subject: s/Dont'/Don't/ --- railties/lib/rails/generators/rails/controller/controller_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/generators') diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb index fbecab1823..a48cc13ed7 100644 --- a/railties/lib/rails/generators/rails/controller/controller_generator.rb +++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb @@ -2,7 +2,7 @@ module Rails module Generators class ControllerGenerator < NamedBase # :nodoc: argument :actions, type: :array, default: [], banner: "action action" - class_option :skip_routes, type: :boolean, desc: "Dont' add routes to config/routes.rb." + class_option :skip_routes, type: :boolean, desc: "Don't add routes to config/routes.rb." check_class_collision suffix: "Controller" -- cgit v1.2.3 From 07ca1d3ab6a51635df5e84f70d00de5c8962457c Mon Sep 17 00:00:00 2001 From: Genadi Samokovarov Date: Mon, 18 Aug 2014 02:03:58 +0300 Subject: Lock web-console to 2.0.0.beta1 for the first 4.2 beta The console on exception code isn't available on the stable releases yet. Lock it for now, so the beta users get a sneak peak of the console features. --- railties/lib/rails/generators/rails/app/templates/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/generators') diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 8b51fda359..d6311829fa 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -31,7 +31,7 @@ group :development, :test do <%- end -%> # Access an IRB console on exceptions page and /console in development - gem 'web-console' + gem 'web-console', '2.0.0.beta1' <%- if spring_install? %> # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' -- cgit v1.2.3 From c20c86ee9e944e38ce0eb581e4af3ad4af839875 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 17 Aug 2014 16:40:41 -0700 Subject: Dont encourage people to run without autoflush in production --- .../rails/app/templates/config/environments/production.rb.tt | 3 --- 1 file changed, 3 deletions(-) (limited to 'railties/lib/rails/generators') diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 277fe01e89..bec7716a9b 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -70,9 +70,6 @@ Rails.application.configure do # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify - # Disable automatic flushing of the log to improve performance. - # config.autoflush_log = false - # Use default logging formatter so that PID and timestamp are not suppressed. config.log_formatter = ::Logger::Formatter.new <%- unless options.skip_active_record? -%> -- cgit v1.2.3