diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-05-16 06:11:57 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-05-16 06:11:57 -0700 |
| commit | 1817c4fba16e715c38f49457ef52259bd95e8304 (patch) | |
| tree | ad9243fc84275f589ad6ba76d9678382ff5b0a95 | |
| parent | 70a36487830a6e47dadfe5893d9a5782782ff4ff (diff) | |
| parent | 46faadfacc70254ebfe693c662b6883556147dac (diff) | |
| download | rails-1817c4fba16e715c38f49457ef52259bd95e8304.tar.gz rails-1817c4fba16e715c38f49457ef52259bd95e8304.tar.bz2 rails-1817c4fba16e715c38f49457ef52259bd95e8304.zip | |
Merge pull request #10639 from cbartlett/master
Remove trailing line break in template
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt index 4f1d56cd2f..f2110c2c70 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt @@ -7,8 +7,8 @@ ActiveSupport.on_load(:action_controller) do wrap_parameters format: [:json] if respond_to?(:wrap_parameters) end - <%- unless options.skip_active_record? -%> + # To enable root element in JSON for ActiveRecord objects. # ActiveSupport.on_load(:active_record) do # self.include_root_in_json = true |