aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/tasks
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2016-06-03 09:40:42 -0400
committerPrathamesh Sonpatki <csonpatki@gmail.com>2016-06-04 11:03:04 -0400
commita7adec9336bca1fed9684f36acdd53ea231ce4b7 (patch)
tree8dd21946c12903552892f88bf09b8016af805045 /railties/lib/rails/tasks
parentb362ef9cb54a21fe23eda82539097a59c61af607 (diff)
downloadrails-a7adec9336bca1fed9684f36acdd53ea231ce4b7.tar.gz
rails-a7adec9336bca1fed9684f36acdd53ea231ce4b7.tar.bz2
rails-a7adec9336bca1fed9684f36acdd53ea231ce4b7.zip
Fix minor regression about old apps not getting per_form_csrf and request_forgery_protection configs
- Earlier per_form_csrf_tokens and request_forgery_protection config files were generated for old apps upgraded to Rails 5. - But when we collapsed all initializers into one file, the entire file does not get created for old apps. - This commit fixes it and also changes values for all new defaults for old apps so that they will not break. - Also added a test for `rails app:update`.
Diffstat (limited to 'railties/lib/rails/tasks')
-rw-r--r--railties/lib/rails/tasks/framework.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 3e771167ee..70458299c5 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -48,7 +48,7 @@ namespace :app do
require 'rails/generators'
require 'rails/generators/rails/app/app_generator'
gen = Rails::Generators::AppGenerator.new ["rails"],
- { api: !!Rails.application.config.api_only },
+ { api: !!Rails.application.config.api_only, update: true, force: ENV['FORCE'] },
destination_root: Rails.root
File.exist?(Rails.root.join("config", "application.rb")) ?
gen.send(:app_const) : gen.send(:valid_const?)