Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove caching's dependency on view_context. Also, make it so that the ↵ | Carlhuda | 2010-03-18 | 2 | -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-private | Carlhuda | 2010-03-18 | 1 | -4/+4 |
| | |||||
* | @layout is a confusing name... use @cache_layout | Carlhuda | 2010-03-18 | 1 | -3/+3 |
| | |||||
* | kill where / having method redefine warnings. [#4225 state:resolved] | Aaron Patterson | 2010-03-18 | 1 | -0/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Merge branch 'master' of github.com:rails/rails | wycats | 2010-03-18 | 1 | -8/+8 |
|\ | |||||
| * | While isolated tests are useful, they take far too long to run for us to be ↵ | Carlhuda | 2010-03-18 | 1 | -8/+8 |
| | | | | | | | | getting useful information from CI. Perhaps another box that runs the isolated tests every 3 hours (instead of per commit) | ||||
* | | Fixed require line | Sebastian Martinez | 2010-03-18 | 1 | -1/+1 |
|/ | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | added require abstract_unit on setter_trap.rb | Sebastian Martinez | 2010-03-18 | 1 | -0/+2 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Fix an error in isolated running of tests | Carlhuda | 2010-03-18 | 1 | -8/+0 |
| | |||||
* | AS datetime conversions now require AS time conversions | snusnu | 2010-03-18 | 1 | -0/+1 |
| | |||||
* | squelching more warnings in the AR tests. [#4218 state:resolved] | Aaron Patterson | 2010-03-18 | 4 | -14/+45 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Sending the partial as info is no longer required. | José Valim | 2010-03-18 | 2 | -5/+5 |
| | |||||
* | Use Array.wrap not Array() | Jeremy Kemper | 2010-03-17 | 3 | -4/+8 |
| | |||||
* | Fix broken test due to constant collision | Jeremy Kemper | 2010-03-17 | 2 | -6/+4 |
| | |||||
* | Kill nonexistent method removal | Jeremy Kemper | 2010-03-17 | 1 | -2/+0 |
| | |||||
* | Deleting and setting a cookie in the same request was broken | Mathias Biilmann Christensen | 2010-03-17 | 2 | -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 tests | Carlhuda | 2010-03-17 | 2 | -1/+3 |
| | |||||
* | Fix for missing dependency in ActionDispatch::Integration | Mathias Biilmann Christensen | 2010-03-17 | 1 | -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 ↵ | Carlhuda | 2010-03-17 | 15 | -79/+104 |
| | | | | ActionController::Base#template since it is no longer needed. | ||||
* | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-17 | 1 | -1/+2 |
|\ | |||||
| * | Require AS singleton_class code in AS output_safety | snusnu | 2010-03-17 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Mark bang instrumentations as something that you shuold not be listening to. | José Valim | 2010-03-17 | 4 | -14/+9 |
| | | |||||
* | | Ensure json is loaded before using responders. | José Valim | 2010-03-17 | 2 | -1/+2 |
|/ | |||||
* | Remove unneeded AV::Base and AV::Template monkey-patches | Carlhuda | 2010-03-17 | 3 | -24/+3 |
| | |||||
* | Modify assert_template to use instrumentation | Carlhuda | 2010-03-17 | 5 | -95/+89 |
| | |||||
* | Install url helpers on module instance so they can be accessed | Joshua Peek | 2010-03-17 | 2 | -5/+14 |
| | | | | globally | ||||
* | cleaning up a bunch of method already defined warnings [#4209 state:resolved] | Aaron Patterson | 2010-03-17 | 2 | -3/+18 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | fixing activemodel tests. [#4210 state:resolved] | Aaron Patterson | 2010-03-17 | 1 | -0/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Move require closer to home | Jeremy Kemper | 2010-03-17 | 2 | -1/+1 |
| | |||||
* | fixing activerecord tests [#4205 state:resolved] | Aaron Patterson | 2010-03-17 | 2 | -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? | wycats | 2010-03-17 | 2 | -14/+6 |
| | |||||
* | Fix some more warnings on 1.9 | wycats | 2010-03-17 | 3 | -3/+12 |
| | |||||
* | Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵ | wycats | 2010-03-17 | 17 | -19/+37 |
| | | | | warnings are in dependencies. | ||||
* | Eliminate warnings for AM on 1.8 | wycats | 2010-03-16 | 11 | -13/+47 |
| | |||||
* | Another missing require | wycats | 2010-03-16 | 1 | -0/+1 |
| | |||||
* | link_to_function is here to stay | Joshua Peek | 2010-03-16 | 3 | -34/+117 |
| | |||||
* | Fix missing require | wycats | 2010-03-16 | 1 | -0/+1 |
| | |||||
* | Make sure options[:anchor] is correct in shorthand cases | wycats | 2010-03-16 | 1 | -2/+5 |
| | |||||
* | scope_key_by_partial fix for Ruby 1.9 when there's virtual_path [#4202 ↵ | Santiago Pastorino | 2010-03-16 | 3 | -2/+10 |
| | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Use human_name in scaffold. | José Valim | 2010-03-17 | 4 | -3/+25 |
| | |||||
* | Do not always include the named URL helpers into AC::Base and AV::Base. | Carl Lerche | 2010-03-16 | 5 | -4/+29 |
| | |||||
* | Make RouteSet#finalize! a NOOP if it's been called already. Call finalize! ↵ | Carl Lerche | 2010-03-16 | 1 | -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é Valim | 2010-03-16 | 3 | -3/+23 |
| | |||||
* | fisting uninitialized ivar warnings. [#4198 state:resolved] | Aaron Patterson | 2010-03-16 | 4 | -18/+21 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | translation method of TranslationHelper module returns always SafeBuffer ↵ | Santiago Pastorino | 2010-03-16 | 3 | -2/+10 |
| | | | | | | [#4194 status:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | adds tests for #flush_output_buffer | Xavier Noria | 2010-03-16 | 1 | -2/+37 |
| | | | | | | [#4196 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | adds tests for #capture | Xavier Noria | 2010-03-16 | 1 | -0/+23 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | clean up more warnings, remove unnecessary methods, fix eval line numbers. ↵ | Aaron Patterson | 2010-03-16 | 5 | -12/+13 |
| | | | | | | [#4193 state:resolved] Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Some more tweaks on <% %>. | Carlhuda | 2010-03-16 | 4 | -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 Golick | 2010-03-16 | 1 | -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> |