aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Change functional tests to make use of a setup block.José Valim2010-03-161-5/+9
|
* Change array entries to safe doesn't worth then the array is joined as a ↵Santiago Pastorino2010-03-161-1/+1
| | | | | | string losing the safe property of his entries [#4134 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Deprecated framework rake tasks should exit with non-zero exit code [#4177 ↵Chris Griego2010-03-161-3/+3
| | | | | | status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Break a window :/Jeremy Kemper2010-03-155-7/+7
|
* RJS may cache an arrayJeremy Kemper2010-03-151-1/+1
|
* Fix link_to with blockJeremy Kemper2010-03-152-5/+2
|
* link_to_remote -> link_to :remote => trueJeremy Kemper2010-03-151-1/+1
|
* Swear I ran this testJeremy Kemper2010-03-151-1/+1
|
* Integration test url options should account for :protocol not just https?Jeremy Kemper2010-03-152-9/+8
|
* removing dead code from activerecord tests. [#4187 state:resolved]Aaron Patterson2010-03-154-46/+0
| | | | Signed-off-by: wycats <wycats@gmail.com>
* cleaning up a bunch of parse time warnings in AR [#4186 state:resolved]Aaron Patterson2010-03-159-26/+26
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Move more normalization up to the lookup context, so it does not have to ↵José Valim2010-03-164-38/+40
| | | | repeat in every resolver.
* Revert "Reinstate old default_url_options method signature"Jeremy Kemper2010-03-151-1/+1
| | | | This reverts commit 5913dd478150710fc0b72a0568f68e13c958d6bc.
* adds test coverage for with_output_bufferXavier Noria2010-03-151-3/+45
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Reinstate old default_url_options method signatureJeremy Kemper2010-03-151-1/+1
|
* Allow memcache-client 1.8.0Jeremy Kemper2010-03-151-1/+1
|
* Add deprecation notices for <% %>.Carlhuda2010-03-1515-97/+88
| | | | | | | | | | | | | | | | * The approach is to compile <% %> into a method call that checks whether the value returned from a block is a String. If it is, it concats to the buffer and prints a deprecation warning. * <%= %> uses exactly the same logic to compile the template, which first checks to see whether it's compiling a block. * This should have no impact on other uses of block in templates. For instance, in <% [1,2,3].each do |i| %><%= i %><% end %>, the call to each returns an Array, not a String, so the result is not concatenated * In two cases (#capture and #cache), a String can be returned that should *never* be concatenated. We have temporarily created a String subclass called NonConcattingString which behaves (and is serialized) identically to String, but is not concatenated by the code that handles deprecated <% %> block helpers. Once we remove support for <% %> block helpers, we can remove NonConcattingString.
* Hack to keep column metadata queries out of test query countsJeremy Kemper2010-03-151-0/+5
|