aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ | | | | | | Issue #3427 - asset_path_conflicts
| * | Let's do the same trick for asset_path that we do for ↵Adrian Pike2011-12-052-8/+66
| | | | | | | | | | | | | | | | | | [image,javascript,stylesheet]_path to avoid namespace conflicts on named routes. Closes #3427
* | | 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 goes with the earliest match, named routes use the latest match)
| * | Named Routes shouldn't override existing ones (currently route recognition ↵Andy Jeffries2011-12-052-3/+3
| | | | | | | | | | | | goes with the earliest match, named routes use the latest match)
* | | 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 ↵Overbryd2011-12-051-1/+2
| | | | | | | | curly regexp and by mentoining the protocol relative scheme in the internal comment
* | Fix for redirect_to to respect urls with a network path reference like ↵Overbryd2011-12-052-2/+12
| | | | | | | | "//asset.host.com/resources/1235" see issue #3856
* | 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
|\ | | | | | | | | | | | | | | | | * A Railtie API for registering new exceptions and their respective status code (check Active Record railtie for an example) * Extraction of ShowExceptions middleware logging and debugging features into a middleware called DebugExceptions Conflicts: actionpack/CHANGELOG.md
| * 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 ↵David Heinemeier Hansson2011-12-012-4/+4
| | | | | | | | | | | | | | | | fresh_when/stale? conditional get methods from Action Pack" Needless indirection with no added value. This reverts commit 535853e83b9092078035a5abb2aa242fba815c05.
* | Added ActiveRecord::Base#last_modified to work with the new ↵David Heinemeier Hansson2011-12-012-4/+4
| | | | | | | | fresh_when/stale? conditional get methods from Action Pack
* | 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
| | | When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation)
* 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
| | | | | | `path_names` can only be used for affecting `new` and `edit`
| * Fix ActionDispatch::Request method explanationsTravis Pew2011-11-281-5/+5
| | | | | | | | | | | | | | | | The methods, "post?", "put?", "head?", etc. contain an incorrect explanation. They state that they are equivalent to request_method == :type, but this is not accurate because the methods convert the string to a symbol. They are actually equivalent to: request_method_symbol == :type
* | 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 ↵José Valim2011-11-304-2/+24
| | | | | | | | a before callback halts.
* | 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 ↵Jon Leighton2011-11-292-9/+9
| | | | | | | | method.
* | 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
| | | | | | | | This reverts commit c4af5f00f602b9e1c3166872902265836daf321b.
* | update CHANGELOGVasiliy Ermolovich2011-11-281-0/+10
| |
* | add namespace options to form_forVasiliy Ermolovich2011-11-272-2/+85
| | | | | | | | | | You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate HTML id
* | fix label with block in erblest2011-11-273-2/+13
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-262-3/+3
|\
| * use any? to check for sizeVijay Dev2011-11-261-1/+1
| |
| * what's -> that'sUģis Ozols2011-11-251-1/+1
| |
| * Remove unnecessary comment.Uģis Ozols2011-11-251-1/+1
| |