diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
| commit | b04230e3bbf912d60601e9e7b797c4cd43581d51 (patch) | |
| tree | 97a2f784a2ec2bfae4f960af56a9280dad6f7774 /railties/CHANGELOG | |
| parent | 867829b187969607aa12f2b0457f25da9c204db0 (diff) | |
| parent | 6e3bee6cf1f0d2684152292db0a8b757249824fd (diff) | |
| download | rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.gz rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.bz2 rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
Diffstat (limited to 'railties/CHANGELOG')
| -rw-r--r-- | railties/CHANGELOG | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 0bc1ea32bc..fc9277bd28 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,9 @@ *Edge* +* Removed config/initializers/new_rails_defaults.rb as all frameworks now follow the settings from it [DHH] + +* Set config.time_zone to UTC by default [DHH] + * Added default .gitignore (this is just recognizing Git market share, don't throw a hissy if you use another SCM) [DHH] * Added cookies.permanent, cookies.signed, and cookies.permanent.signed accessor for common cookie actions [DHH]. Examples: |