diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-16 11:19:08 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-16 11:19:08 -0800 |
| commit | f19ba681a80c0b0be604c58389ce2892c623d027 (patch) | |
| tree | b8020f0e30d6dc93823e5fe9c6fe16a9ada67b74 /guides/source | |
| parent | f3e379f0c97149bb29a63dc9db8a2836addcd957 (diff) | |
| parent | 73ba2c14cd7d7dfb2d132b18c47ade995401736f (diff) | |
| download | rails-f19ba681a80c0b0be604c58389ce2892c623d027.tar.gz rails-f19ba681a80c0b0be604c58389ce2892c623d027.tar.bz2 rails-f19ba681a80c0b0be604c58389ce2892c623d027.zip | |
Merge branch 'master' into adequaterecord
* master:
Make AR::Base#touch fire the after_commit and after_rollback callbacks
Fix test for cache_key + touched
Revert "methods are defined right after the module_eval, so we don't need to do"
Revert "Don't remove trailing slash from PATH_INFO for mounted apps"
Add failing test for #13369
reset column information after fiddling with `Encoding.default_internal`
we have `with_env_tz` as global test helper. Remove duplicate.
isolate class attribute assignment in `migration_test.rb`
use `teardown` for cleanup, not `setup`.
tests without transactional fixtures need to cleanup afterwards.
no need to `return skip` in tests. `skip` is enough.
methods are defined right after the module_eval, so we don't need to do any line number maths
Get rid of unused TransactionError constant
Avoid converting :on option to array twice when defining commit/rollback callbacks
Unify changelog entries about single quotes [ci skip]
Use single quotes in generated files
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index 72a4bb4c2d..ab8cabe48d 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -130,7 +130,7 @@ Rails-specific features. For example: ```ruby class FooBar def as_json(options = nil) - { foo: "bar" } + { foo: 'bar' } end end @@ -503,13 +503,13 @@ get 'こんにちは', controller: 'welcome', action: 'index' ```ruby # Rails 3.x - match "/" => "root#index" + match '/' => 'root#index' # becomes - match "/" => "root#index", via: :get + match '/' => 'root#index', via: :get # or - get "/" => "root#index" + get '/' => 'root#index' ``` * Rails 4.0 has removed `ActionDispatch::BestStandardsSupport` middleware, `<!DOCTYPE html>` already triggers standards mode per http://msdn.microsoft.com/en-us/library/jj676915(v=vs.85).aspx and ChromeFrame header has been moved to `config.action_dispatch.default_headers`. @@ -705,7 +705,7 @@ You can help test performance with these additions to your test environment: ```ruby # Configure static asset server for tests with Cache-Control for performance config.serve_static_assets = true -config.static_cache_control = "public, max-age=3600" +config.static_cache_control = 'public, max-age=3600' ``` ### config/initializers/wrap_parameters.rb |