aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix render partial with layout and no blockCarlos Antonio da Silva2010-11-112-0/+12
| | | | | | | | | | | | | | | | When using a render :partial with :layout call, without giving a block, if the given :partial had another render :partial call, the layout was not being rendered. This commit fixes this context by storing variables before rendering the partial, so they are not overrided in any successive call to render partials down the path. All ActionPack tests are ok.
* | Fix issue with rendering partials and then yielding inside a render layout callCarlos Antonio da Silva2010-11-115-0/+26
| | | | | | | | | | | | | | The given block was never being executed when another render :partial call existed before the yield call, due to the block being overriden. This commit also adds some more tests to render with :layout option.
* | patching to ensure separator is printed with order [#5816 state:resolved]Aditya Sanghi2010-11-112-0/+43
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Allow AR Session Store to be renewedJosé Valim2010-11-111-0/+20
| |
* | syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in masterXavier Noria2010-11-091-2/+4
| |
* | registers number_to_currency's :negative_format in the CHANGELOGXavier Noria2010-11-091-0/+2
| |
* | Strip regexp anchors from rake routes output [#5934 state:resolved]Andrew White2010-11-091-1/+2
| |
* | Make safe_append= live on AV::OutputBuffer not AS::SafeBufferMichael Koziarski2010-11-081-0/+1
| | | | | | | | | | | | Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
* | Added support for Erubis <%== tagJan Maurits Faber2010-11-082-1/+15
| | | | | | | | | | | | | | <%== x %> is syntactic sugar for <%= raw(x) %> Signed-off-by: Michael Koziarski <michael@koziarski.com> [#5918 status:committed]
* | Make cookies hash in ActionDispatch::TestProcess indifferent access [#5761 ↵David Trasbo2010-11-072-1/+19
| | | | | | | | | | | | state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Move @assigns from the controller to the test itselfSantiago Pastorino2010-11-062-1/+1
| |
* | Fix problems trying to functional test AC::Metal controllersSantiago Pastorino2010-11-063-11/+10
| | | | | | | | [#5393 state:committed]
* | Correctly handle the case of an API response that returns a hash by treating ↵Chris Eppstein2010-11-062-1/+17
| | | | | | | | a single hash argument as the resource instead of as options.
* | Just initialize options with an empty hashSantiago Pastorino2010-11-031-2/+1
| |
* | made a pass to the docs of :negative_formatXavier Noria2010-11-031-5/+7
| |
* | Added :negative_format option to number_to_currency function [#5894 ↵Don Wilson2010-11-023-8/+24
| | | | | | | | | | | | state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* | Test that capture doesn't escape twiceSantiago Pastorino2010-11-021-2/+7
| |
* | Call as ERB::Util.html_escape since is not the module is not included hereSantiago Pastorino2010-11-021-1/+1
| |
* | Make sure capture's output gets html_escaped [#5545 state:resolved]Jeff Kreeftmeijer2010-11-023-7/+8
| | | | | | | | | | | | | | Also remove a duplicate test_link_to_unless assertion and add .html_safe to the remaining one. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Add additional HTTP request methods from the following RFCs:Andrew White2010-11-023-4/+53
|/ | | | | | | | | | | | | | | | | | | | | | | | | * Hypertext Transfer Protocol -- HTTP/1.1 http://www.ietf.org/rfc/rfc2616.txt) * HTTP Extensions for Distributed Authoring -- WEBDAV http://www.ietf.org/rfc/rfc2518.txt * Versioning Extensions to WebDAV http://www.ietf.org/rfc/rfc3253.txt * Ordered Collections Protocol (WebDAV) http://www.ietf.org/rfc/rfc3648.txt * Web Distributed Authoring and Versioning (WebDAV) Access Control Protocol http://www.ietf.org/rfc/rfc3744.txt * Web Distributed Authoring and Versioning (WebDAV) SEARCH http://www.ietf.org/rfc/rfc5323.txt * PATCH Method for HTTP http://www.ietf.org/rfc/rfc5789.txt [#2809 state:resolved] [#5895 state:resolved]
* Ensure that Rails.env is defined firstAndrew White2010-10-271-1/+1
|
* Use latest I18n.José Valim2010-10-261-1/+1
|
* Fix loop introduced by rack:dda892dJeremy Kemper2010-10-261-6/+1
|
* Remove rack-cache-purge.José Valim2010-10-262-10/+0
|
* Allow generated url helpers to be overriden [#5243 state:resolved]Andrew White2010-10-262-5/+23
|
* Don't write out secure cookies unless the request is secureAndrew White2010-10-253-3/+39
|
* Remove this require since active_support/testing/default doesn't exist anymoreSantiago Pastorino2010-10-201-1/+0
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-191-11/+0
|\
| * Merge branch 'master' of github.com:lifo/docrailsAditya Sanghi2010-10-171-1/+1
| |\
| * | The deleted examples are redundant.Aditya Sanghi2010-10-171-11/+0
| | | | | | | | | | | | They do not reveal anything new that is not already been explained in preceding example.
* | | rewords a little the RDoc of the tag helperXavier Noria2010-10-191-4/+5
| | |
* | | adds the new :data idiom in tag helpers to the CHANGELOGXavier Noria2010-10-191-0/+7
| | |
* | | Additional documentation for data-* attributes.Stephen Celis & Xavier Noria2010-10-191-10/+17
| | | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* | | avoid a few comparisonsAaron Patterson2010-10-181-3/+3
| | |
* | | Fix status initialization when custom status providedKrekoten' Marjan2010-10-182-2/+6
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | AC::Caching DRYupKrekoten' Marjan2010-10-181-5/+1
| | | | | | | | | | | | | | | | | | | | | Remove ActionController::Caching::Pages#caching_allowed because it duplicates ActionController::Caching#caching_allowed? Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | remove strange else blockAaron Patterson2010-10-181-9/+7
| | |
* | | skip extra work if no text or phrase was providedAaron Patterson2010-10-181-12/+11
| | |
* | | lets not invert the hash on every iteration through this loopAaron Patterson2010-10-181-1/+3
| | |
* | | use -= in place of the expanded formAaron Patterson2010-10-181-1/+1
| | |
* | | implicitly return nil if there is no numberAaron Patterson2010-10-181-2/+2
| | |
* | | implicit return of nilAaron Patterson2010-10-181-1/+1
| | |
* | | use regex escape sequences to shorten stuff upAaron Patterson2010-10-181-2/+2
| | |
* | | join strings rather than resizing bufferAaron Patterson2010-10-181-2/+2
| | |
* | | Call html_escape in ERB::Util module and don't mix it in in the helpersSantiago Pastorino2010-10-187-20/+24
| | |
* | | Invoke html_escape on the proper receiverSantiago Pastorino2010-10-181-1/+1
| | |
* | | Merge CHANGELOGs from 3-0-stableSantiago Pastorino2010-10-181-0/+4
| | |
* | | Tidy up a bit this codeSantiago Pastorino2010-10-181-4/+6
| | |
* | | Why strip only the extension, this can be done by the userSantiago Pastorino2010-10-181-1/+1
| | |
* | | This or login doesn't make senseSantiago Pastorino2010-10-181-3/+3
| | |