aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3884 from sikachu/master-fix_layoutJosé Valim2011-12-076-40/+125
|\
| * Allow layout fallback when using `layout` methodPrem Sichanugrist2011-12-063-26/+93
| * Fix bug in assert_template when using only `:layout` optionPrem Sichanugrist2011-12-063-14/+32
* | Merge pull request #3878 from kennyj/should_use_default_charsetJosé Valim2011-12-072-1/+12
|\ \ | |/ |/|
| * Use default charset when we read content type without charset.kennyj2011-12-072-1/+12
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-061-4/+4
|\ \ | |/ |/|
| * Use do end for multiline block.Uģis Ozols2011-12-051-2/+2
| * .rhtml and .rxml was removed in Rails 3.Uģis Ozols2011-12-051-2/+2
* | Sync AP CHANGELOG with 3-1-stableSantiago Pastorino2011-12-061-0/+8
* | Merge pull request #3428 from adrianpike/asset_path_conflictsSantiago Pastorino2011-12-062-8/+66
|\ \
| * | Let's do the same trick for asset_path that we do for [image,javascript,style...Adrian Pike2011-12-052-8/+66
* | | Allowing string as url argument for expire_actionThomas von Deyen2011-12-062-3/+22
|/ /
* | Merge pull request #3861 from andyjeffries/masterJosé Valim2011-12-052-3/+3
|\ \
| * | Named Routes shouldn't override existing ones (currently route recognition go...Andy Jeffries2011-12-052-3/+3
* | | use classify in ParamsWrapper to derive model name from controller namelest2011-12-052-1/+36
|/ /
* | Minor enhancement by not unnecessarely escaping forward slashing within a cur...Overbryd2011-12-051-1/+2
* | Fix for redirect_to to respect urls with a network path reference like "//ass...Overbryd2011-12-052-2/+12
* | form_for with +:as+ option uses "action_as" as css class and idVasiliy Ermolovich2011-12-043-13/+25
|/
* Fix failing cascade exception.José Valim2011-12-033-2/+12
* Try to play nice with plugins doing monkey patches.José Valim2011-12-021-0/+5
* Merge branch 'exceptions' with the following features:José Valim2011-12-0111-230/+359
|\
| * Remove unnecessary test setup.José Valim2011-12-011-6/+1
| * Split and improve show and debug exceptions middlewares.José Valim2011-12-013-87/+141
| * Split ShowExceptions responsibilities in two middlewares.José Valim2011-12-017-93/+123
| * Add a deprecation to old show exceptions API (even though it was not public).José Valim2011-12-011-0/+14
| * Add an ExceptionWrapper that wraps an exception and provide convenience helpers.José Valim2011-12-015-77/+104
| * Allow rescue responses to be configured through a railtie.José Valim2011-12-013-9/+18
* | Revert "Added ActiveRecord::Base#last_modified to work with the new fresh_whe...David Heinemeier Hansson2011-12-012-4/+4
* | Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale?...David Heinemeier Hansson2011-12-012-4/+4
* | Allow fresh_when/stale? to take a record instead of an options hash [DHH]David Heinemeier Hansson2011-12-013-4/+97
|/
* Update CHANGELOG.José Valim2011-12-011-1/+3
* Leave default_asset_host_protocol unsetJonathan del Strother2011-12-011-2/+0
* minor typo fixVijay Dev2011-12-011-1/+1
* fix exception page when template contains utf-8 and parameters contain utf-8lest2011-11-301-1/+5
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-302-7/+7
|\
| * Fixing incorrect documentation Aviv Ben-Yosef2011-11-301-2/+2
| * Fix ActionDispatch::Request method explanationsTravis Pew2011-11-281-5/+5
* | fix method redefined warnings in testslest2011-11-303-12/+5
* | fix warning in tests when using render_erb helperlest2011-11-301-0/+2
* | test helpers in erb using erblest2011-11-306-17/+31
* | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a...José Valim2011-11-304-2/+24
* | Update sprockets which theoretically fixes the regression we have seen.José Valim2011-11-301-1/+1
* | Fixes for using action view template in isolation.José Valim2011-11-303-2/+12
* | Deprecate set_sequence_name in favour of self.sequence_name=Jon Leighton2011-11-291-2/+2
* | Deprecate set_table_name in favour of self.table_name= or defining your own m...Jon Leighton2011-11-292-9/+9
* | Handle correctly optional parameters for callable asset_host.Marc-Andre Lafortune2011-11-292-2/+10
* | put backtrace_cleaner to envlest2011-11-282-13/+20
* | Revert "use any? to check for size"Vijay Dev2011-11-281-1/+1
* | update CHANGELOGVasiliy Ermolovich2011-11-281-0/+10
* | add namespace options to form_forVasiliy Ermolovich2011-11-272-2/+85