| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | Merge pull request #3888 from kennyj/should_use_default_charset | José Valim | 2011-12-08 | 1 | -0/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Assign config.encoding to AD::Response.default_charset at the initialization ... | kennyj | 2011-12-07 | 1 | -0/+1 |
* | | | | Remove #:nodoc: from partial renderer. | José Valim | 2011-12-07 | 1 | -1/+1 |
* | | | | Use freezed string constant. Some string literals is used repeatedly. | kennyj | 2011-12-08 | 3 | -24/+40 |
* | | | | Merge pull request #3884 from sikachu/master-fix_layout | José Valim | 2011-12-07 | 6 | -40/+125 |
|\ \ \ \ |
|
| * | | | | Allow layout fallback when using `layout` method | Prem Sichanugrist | 2011-12-06 | 3 | -26/+93 |
| * | | | | Fix bug in assert_template when using only `:layout` option | Prem Sichanugrist | 2011-12-06 | 3 | -14/+32 |
* | | | | | Merge pull request #3878 from kennyj/should_use_default_charset | José Valim | 2011-12-07 | 2 | -1/+12 |
|\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / / |
|
| * | | | Use default charset when we read content type without charset. | kennyj | 2011-12-07 | 2 | -1/+12 |
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-06 | 1 | -4/+4 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Use do end for multiline block. | Uģis Ozols | 2011-12-05 | 1 | -2/+2 |
| * | | | .rhtml and .rxml was removed in Rails 3. | Uģis Ozols | 2011-12-05 | 1 | -2/+2 |
* | | | | Sync AP CHANGELOG with 3-1-stable | Santiago Pastorino | 2011-12-06 | 1 | -0/+8 |
* | | | | Merge pull request #3428 from adrianpike/asset_path_conflicts | Santiago Pastorino | 2011-12-06 | 2 | -8/+66 |
|\ \ \ \ |
|
| * | | | | Let's do the same trick for asset_path that we do for [image,javascript,style... | Adrian Pike | 2011-12-05 | 2 | -8/+66 |
* | | | | | Allowing string as url argument for expire_action | Thomas von Deyen | 2011-12-06 | 2 | -3/+22 |
|/ / / / |
|
* | | | | Merge pull request #3861 from andyjeffries/master | José Valim | 2011-12-05 | 2 | -3/+3 |
|\ \ \ \ |
|
| * | | | | Named Routes shouldn't override existing ones (currently route recognition go... | Andy Jeffries | 2011-12-05 | 2 | -3/+3 |
* | | | | | use classify in ParamsWrapper to derive model name from controller name | lest | 2011-12-05 | 2 | -1/+36 |
|/ / / / |
|
* | | | | Minor enhancement by not unnecessarely escaping forward slashing within a cur... | Overbryd | 2011-12-05 | 1 | -1/+2 |
* | | | | Fix for redirect_to to respect urls with a network path reference like "//ass... | Overbryd | 2011-12-05 | 2 | -2/+12 |
* | | | | form_for with +:as+ option uses "action_as" as css class and id | Vasiliy Ermolovich | 2011-12-04 | 3 | -13/+25 |
|/ / / |
|
* | | | Fix failing cascade exception. | José Valim | 2011-12-03 | 3 | -2/+12 |
* | | | Try to play nice with plugins doing monkey patches. | José Valim | 2011-12-02 | 1 | -0/+5 |
* | | | Merge branch 'exceptions' with the following features: | José Valim | 2011-12-01 | 11 | -230/+359 |
|\ \ \ |
|
| * | | | Remove unnecessary test setup. | José Valim | 2011-12-01 | 1 | -6/+1 |
| * | | | Split and improve show and debug exceptions middlewares. | José Valim | 2011-12-01 | 3 | -87/+141 |
| * | | | Split ShowExceptions responsibilities in two middlewares. | José Valim | 2011-12-01 | 7 | -93/+123 |
| * | | | Add a deprecation to old show exceptions API (even though it was not public). | José Valim | 2011-12-01 | 1 | -0/+14 |
| * | | | Add an ExceptionWrapper that wraps an exception and provide convenience helpers. | José Valim | 2011-12-01 | 5 | -77/+104 |
| * | | | Allow rescue responses to be configured through a railtie. | José Valim | 2011-12-01 | 3 | -9/+18 |
* | | | | Revert "Added ActiveRecord::Base#last_modified to work with the new fresh_whe... | David Heinemeier Hansson | 2011-12-01 | 2 | -4/+4 |
* | | | | Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale?... | David Heinemeier Hansson | 2011-12-01 | 2 | -4/+4 |
* | | | | Allow fresh_when/stale? to take a record instead of an options hash [DHH] | David Heinemeier Hansson | 2011-12-01 | 3 | -4/+97 |
|/ / / |
|
* | | | Update CHANGELOG. | José Valim | 2011-12-01 | 1 | -1/+3 |
* | | | Leave default_asset_host_protocol unset | Jonathan del Strother | 2011-12-01 | 1 | -2/+0 |
* | | | minor typo fix | Vijay Dev | 2011-12-01 | 1 | -1/+1 |
* | | | fix exception page when template contains utf-8 and parameters contain utf-8 | lest | 2011-11-30 | 1 | -1/+5 |
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-30 | 2 | -7/+7 |
|\ \ \ |
|
| * | | | Fixing incorrect documentation
| Aviv Ben-Yosef | 2011-11-30 | 1 | -2/+2 |
| * | | | Fix ActionDispatch::Request method explanations | Travis Pew | 2011-11-28 | 1 | -5/+5 |
* | | | | fix method redefined warnings in tests | lest | 2011-11-30 | 3 | -12/+5 |
* | | | | fix warning in tests when using render_erb helper | lest | 2011-11-30 | 1 | -0/+2 |
* | | | | test helpers in erb using erb | lest | 2011-11-30 | 6 | -17/+31 |
* | | | | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a... | José Valim | 2011-11-30 | 4 | -2/+24 |
* | | | | Update sprockets which theoretically fixes the regression we have seen. | José Valim | 2011-11-30 | 1 | -1/+1 |
* | | | | Fixes for using action view template in isolation. | José Valim | 2011-11-30 | 3 | -2/+12 |
* | | | | Deprecate set_sequence_name in favour of self.sequence_name= | Jon Leighton | 2011-11-29 | 1 | -2/+2 |
* | | | | Deprecate set_table_name in favour of self.table_name= or defining your own m... | Jon Leighton | 2011-11-29 | 2 | -9/+9 |
* | | | | Handle correctly optional parameters for callable asset_host. | Marc-Andre Lafortune | 2011-11-29 | 2 | -2/+10 |