diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-02 13:28:48 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-02 13:28:48 -0300 |
| commit | 9a1cc04c90d5ece1d79da4d33686324061afd0c8 (patch) | |
| tree | d7c17dc30850636aca2b66d27548f2d8af2feb3f /railties/lib | |
| parent | ff91808651a19549ea8b101b8abdf5c3f811e0f4 (diff) | |
| parent | 9f7127350448342c8ebbadc193f13fcd35ac3eb7 (diff) | |
| download | rails-9a1cc04c90d5ece1d79da4d33686324061afd0c8.tar.gz rails-9a1cc04c90d5ece1d79da4d33686324061afd0c8.tar.bz2 rails-9a1cc04c90d5ece1d79da4d33686324061afd0c8.zip | |
Merge pull request #24001 from 5t111111/fix-gsub-cookies_serializer
Fix description in cookies_serializer.rb being corrupted by gsub when updating
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index f4d2aa761b..e9435c946a 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -103,7 +103,7 @@ module Rails end unless cookie_serializer_config_exist - gsub_file 'config/initializers/cookies_serializer.rb', /json/, 'marshal' + gsub_file 'config/initializers/cookies_serializer.rb', /json(?!,)/, 'marshal' end unless active_record_belongs_to_required_by_default_config_exist |