aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove caching's dependency on view_context. Also, make it so that the ↵Carlhuda2010-03-182-14/+26
| | | | layout is always rendered the same way (so that layout dependencies on the action actually being rendered aren't masked on the first render)
* Make action_has_layout? non-privateCarlhuda2010-03-181-4/+4
|
* @layout is a confusing name... use @cache_layoutCarlhuda2010-03-181-3/+3
|
* kill where / having method redefine warnings. [#4225 state:resolved]Aaron Patterson2010-03-181-0/+1
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Merge branch 'master' of github.com:rails/railswycats2010-03-181-8/+8
|\
| * While isolated tests are useful, they take far too long to run for us to be ↵Carlhuda2010-03-181-8/+8
| | | | | | | | getting useful information from CI. Perhaps another box that runs the isolated tests every 3 hours (instead of per commit)
* | Fixed require lineSebastian Martinez2010-03-181-1/+1
|/ | | | Signed-off-by: wycats <wycats@gmail.com>
* added require abstract_unit on setter_trap.rbSebastian Martinez2010-03-181-0/+2
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Fix an error in isolated running of testsCarlhuda2010-03-181-8/+0
|
* AS datetime conversions now require AS time conversionssnusnu2010-03-181-0/+1
|
* squelching more warnings in the AR tests. [#4218 state:resolved]Aaron Patterson2010-03-184-14/+45
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Sending the partial as info is no longer required.José Valim2010-03-182-5/+5
|
* Use Array.wrap not Array()Jeremy Kemper2010-03-173-4/+8
|
* Fix broken test due to constant collisionJeremy Kemper2010-03-172-6/+4
|
* Kill nonexistent method removalJeremy Kemper2010-03-171-2/+0
|
* Deleting and setting a cookie in the same request was brokenMathias Biilmann Christensen2010-03-172-0/+12
| | | | | | | | Made sure to remove a cookie from @deleted_cookies when set [#4211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Get modules back into integration testsCarlhuda2010-03-172-1/+3
|
* Fix for missing dependency in ActionDispatch::IntegrationMathias Biilmann Christensen2010-03-171-0/+1
| | | | | | | | | | | When running cucumber features from a new rails 3 app requiring 'cucumber/rails/world' would raise: uninitialized constant ActionDispatch::Integration::Session::Test (NameError) Fixed by requiring 'test/unit/assertions' in action_dispatch/integration Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Modify assert_template to use notifications. Also, remove ↵Carlhuda2010-03-1715-79/+104
| | | | ActionController::Base#template since it is no longer needed.
* Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-171-1/+2
|\
| * Require AS singleton_class code in AS output_safetysnusnu2010-03-171-1/+2
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Mark bang instrumentations as something that you shuold not be listening to.José Valim2010-03-174-14/+9
| |
* | Ensure json is loaded before using responders.José Valim2010-03-172-1/+2
|/
* Remove unneeded AV::Base and AV::Template monkey-patchesCarlhuda2010-03-173-24/+3
|
* Modify assert_template to use instrumentationCarlhuda2010-03-175-95/+89
|
* Install url helpers on module instance so they can be accessedJoshua Peek2010-03-172-5/+14
| | | | globally
* cleaning up a bunch of method already defined warnings [#4209 state:resolved]Aaron Patterson2010-03-172-3/+18
| | | | Signed-off-by: wycats <wycats@gmail.com>
* fixing activemodel tests. [#4210 state:resolved]Aaron Patterson2010-03-171-0/+1
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Move require closer to homeJeremy Kemper2010-03-172-1/+1
|
* fixing activerecord tests [#4205 state:resolved]Aaron Patterson2010-03-172-2/+3
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Any reason we can't just use the slow 1.8 path for transliteration in 1.9?wycats2010-03-172-14/+6
|
* Fix some more warnings on 1.9wycats2010-03-173-3/+12
|
* Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵wycats2010-03-1717-19/+37
| | | | warnings are in dependencies.
* Eliminate warnings for AM on 1.8wycats2010-03-1611-13/+47
|
* Another missing requirewycats2010-03-161-0/+1
|
* link_to_function is here to stayJoshua Peek2010-03-163-34/+117
|
* Fix missing requirewycats2010-03-161-0/+1
|
* Make sure options[:anchor] is correct in shorthand caseswycats2010-03-161-2/+5
|
* scope_key_by_partial fix for Ruby 1.9 when there's virtual_path [#4202 ↵Santiago Pastorino2010-03-163-2/+10
| | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Use human_name in scaffold.José Valim2010-03-174-3/+25
|
* Do not always include the named URL helpers into AC::Base and AV::Base.Carl Lerche2010-03-165-4/+29
|
* Make RouteSet#finalize! a NOOP if it's been called already. Call finalize! ↵Carl Lerche2010-03-161-0/+5
| | | | the first time call() and url_for() are called if the RouteSet has not been finalized yet.
* Fix rendering of HTML partials inside JS templates [#4197 status:resolved]José Valim2010-03-163-3/+23
|
* fisting uninitialized ivar warnings. [#4198 state:resolved]Aaron Patterson2010-03-164-18/+21
| | | | Signed-off-by: wycats <wycats@gmail.com>
* translation method of TranslationHelper module returns always SafeBuffer ↵Santiago Pastorino2010-03-163-2/+10
| | | | | | [#4194 status:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* adds tests for #flush_output_bufferXavier Noria2010-03-161-2/+37
| | | | | | [#4196 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* adds tests for #captureXavier Noria2010-03-161-0/+23
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* clean up more warnings, remove unnecessary methods, fix eval line numbers. ↵Aaron Patterson2010-03-165-12/+13
| | | | | | [#4193 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* Some more tweaks on <% %>.Carlhuda2010-03-164-8/+8
| | | | * The cache helper is now semantically "mark this region for caching" * As a result, <% x = cache do %> no longer works
* Improve performance of multibyte utils.James Golick2010-03-161-1/+1
| | | | | | | Switch from using String#match to using String#=~. There's no need to generate a MatchData for each iteration since we're not using it. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>