diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-01-22 08:47:30 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2016-01-22 08:47:30 +0000 |
| commit | a2a6806063d5f5d1681b5143f7a38cd3fecefe80 (patch) | |
| tree | 207b22ac4a1cc08e57dc717e64fd375b1b273512 | |
| parent | 5d9e923d279f26e117d68d442e5c88a33341fe67 (diff) | |
| parent | 82deb768820e5875c2dc11a4978402b1a13c5b40 (diff) | |
| download | rails-a2a6806063d5f5d1681b5143f7a38cd3fecefe80.tar.gz rails-a2a6806063d5f5d1681b5143f7a38cd3fecefe80.tar.bz2 rails-a2a6806063d5f5d1681b5143f7a38cd3fecefe80.zip | |
Merge pull request #23180 from y-yagi/remove_per_form_csrf_tokens_initializer_from_rails_api
remove `per_form_csrf_tokens` initializer from Rails API
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/api_app_generator_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 9248e16585..3d689ff37e 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -327,6 +327,7 @@ module Rails remove_file 'config/initializers/session_store.rb' remove_file 'config/initializers/cookies_serializer.rb' remove_file 'config/initializers/request_forgery_protection.rb' + remove_file 'config/initializers/per_form_csrf_tokens.rb' end end diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb index 2c24a6e46a..d9eb7770f3 100644 --- a/railties/test/generators/api_app_generator_test.rb +++ b/railties/test/generators/api_app_generator_test.rb @@ -89,6 +89,7 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase config/initializers/cookies_serializer.rb config/initializers/session_store.rb config/initializers/request_forgery_protection.rb + config/initializers/per_form_csrf_tokens.rb lib/assets vendor/assets test/helpers |