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/code/getting_started/app/views | |
| 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/code/getting_started/app/views')
| -rw-r--r-- | guides/code/getting_started/app/views/layouts/application.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/code/getting_started/app/views/layouts/application.html.erb b/guides/code/getting_started/app/views/layouts/application.html.erb index 95368c37a3..d0ba8415e6 100644 --- a/guides/code/getting_started/app/views/layouts/application.html.erb +++ b/guides/code/getting_started/app/views/layouts/application.html.erb @@ -2,8 +2,8 @@ <html> <head> <title>Blog</title> - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> </head> <body> |