diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-17 10:49:47 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-17 10:49:47 -0800 |
commit | c71df74fb1084c9204233ecb37fe54be243cfdc2 (patch) | |
tree | a1fbc29109c5228526b440218bcb785c2e72d423 /actionview/CHANGELOG.md | |
parent | e7f5317ff9696e7e38c56d403ec822ee94aa8e24 (diff) | |
parent | 486db21f919c39cef76b487be45290b7561307e8 (diff) | |
download | rails-c71df74fb1084c9204233ecb37fe54be243cfdc2.tar.gz rails-c71df74fb1084c9204233ecb37fe54be243cfdc2.tar.bz2 rails-c71df74fb1084c9204233ecb37fe54be243cfdc2.zip |
Merge branch 'master' into adequaterecord
* master:
Fix eager load of Serializers on Active Model
Consistence in the block style
Remove warnings on Ruby 2.1
Only some dynamic finders are deprecated.
clean up security guide: his => their [ci skip]
Remove warning
Extract a method to simplify setup code
Use minitest's skip rather than conditionals + early returns
Move AR test classes inside the test case
Do not set up a variable used only in two tests
No need for instance vars on single tests
Cleanup duplicated setup of callbacks in transactions tests
No need to use #send with public methods
Update deprecation warning to give more information about caller
Update changelog
Avoid scanning multiple render calls as a single match.
Improve ERB dependency detection.
Diffstat (limited to 'actionview/CHANGELOG.md')
-rw-r--r-- | actionview/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index a57da72d8c..19877ca8cb 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,10 @@ +* Improved ERB dependency detection. New argument types and formattings for the `render` + calls can be matched. + + Fixes #13074 and #13116 + + *João Britto* + * Use `display:none` instead of `display:inline` for hidden fields Fixes #6403 |