Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-10-14 | 1 | -2/+2 |
|\ | |||||
| * | fix time.to_formatted_time(:time) example | Aditya Sanghi | 2010-10-13 | 1 | -2/+2 |
| | | |||||
* | | Revert "speeding up flattened version of OrderedHash.[]" | Aaron Patterson | 2010-10-13 | 1 | -2/+3 |
| | | | | | | | | This reverts commit 9c53e82d66d0c34b8f35609b7972f28521d5794d. | ||||
* | | speeding up flattened version of OrderedHash.[] | Aaron Patterson | 2010-10-13 | 1 | -3/+2 |
| | | |||||
* | | refactor delete a little | Aaron Patterson | 2010-10-13 | 1 | -4/+1 |
| | | |||||
* | | use unless instead of if ! | Aaron Patterson | 2010-10-13 | 1 | -1/+1 |
|/ | |||||
* | Always pull in version for frameworks (standardize autoload / require / none) | wycats | 2010-10-10 | 1 | -1/+1 |
| | |||||
* | Make ActiveSupport load own version. | Barry Sears | 2010-10-10 | 1 | -0/+1 |
| | | | | | | [#5739 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Fix misleading advice to add 'memcache' to Gemfile | Wincent Colaiuta | 2010-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | [#5539 state:committed] Commit 57144388f removed the hard-coded dependency on the memcache-client gem, and added this warning advising people to install it if needed. The problem is, however, that if people follow the advice literally and install the 'memcache' gem, they will wind up with a completely different thing, which is not API compatible with the memcache-client gem and which Rails can't work with. So, be explicit and tell users to install the 'memcache-client' gem. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Override #store to be consistent with #[]. | Andrea Campi | 2010-10-10 | 2 | -0/+12 |
| | | | | | | [#5775 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Cleanup logger a bit. | José Valim | 2010-10-08 | 1 | -38/+11 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-10-06 | 1 | -2/+2 |
|\ | |||||
| * | Correct documentation that references how *_filter of action_pack are ↵ | Marcelo Giorgi | 2010-10-03 | 1 | -2/+2 |
| | | | | | | | | translated into set_callback/run_callback's (from active_support) invocations. | ||||
* | | Fix copy/paste bug | Erik Michaels-Ober | 2010-10-06 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | calling correct method on minitest for test name when teardown callback fails | Aaron Patterson | 2010-10-04 | 1 | -0/+19 |
| | | |||||
* | | [#5406 state:resolved] calling the correct method on minitest to obtain the ↵ | Aaron Patterson | 2010-10-04 | 1 | -0/+38 |
| | | | | | | | | test name | ||||
* | | PERF: more Hash + map changes | Santiago Pastorino | 2010-10-03 | 1 | -3/+3 |
| | | |||||
* | | remove another lolinject | Aaron Patterson | 2010-10-01 | 1 | -1/+1 |
| | | |||||
* | | speed up index_by by removing a lolinject | Aaron Patterson | 2010-10-01 | 1 | -4/+1 |
| | | |||||
* | | removing AS::Testing::Default in favor of just undefing default_test | Aaron Patterson | 2010-10-01 | 3 | -18/+1 |
|/ | |||||
* | Move uri parser to AS as URI.parser method to reuse it in AP and ARes. | Emilio Tagua | 2010-09-28 | 1 | -0/+8 |
| | |||||
* | revises RDoc of Hash#to_param to be more precise about ordering | Xavier Noria | 2010-09-28 | 1 | -2/+2 |
| | |||||
* | let Hash#to_param and Hash#to_query sort again | Xavier Noria | 2010-09-28 | 2 | -5/+10 |
| | | | | | This was a regression introduced in 5c858220085dc4ddc1bec496747059dfbe32f1da. We bring sorting back because people rely on it, eg for constructing consistent cache keys. | ||||
* | Test for after_create callback order in ActiveSupport [#5703 state:resolved] | Neeraj Singh | 2010-09-27 | 1 | -0/+23 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | after_create in ActiveModel should in the order specified | Neeraj Singh | 2010-09-27 | 1 | -1/+1 |
| | | | | | | [#5650 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'miloops/warnings' | José Valim | 2010-09-27 | 1 | -0/+1 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/url_for.rb | ||||
| * | Remove method if already exists to avoid warnings. | Emilio Tagua | 2010-09-27 | 1 | -0/+1 |
| | | |||||
* | | Call it compile_methods! and do the same on AM. | José Valim | 2010-09-27 | 2 | -4/+4 |
| | | |||||
* | | Make assert_valid_keys slightly faster. | thedarkone | 2010-09-27 | 2 | -5/+7 |
| | | |||||
* | | No need for an extra wrapper array. | thedarkone | 2010-09-27 | 1 | -1/+1 |
| | | |||||
* | | Use native attr_* macros for performance reasons. | thedarkone | 2010-09-27 | 1 | -6/+13 |
| | | |||||
* | | Creating singleton class for every object whenever the instance-level ↵ | thedarkone | 2010-09-27 | 1 | -1/+21 |
| | | | | | | | | accessor is used quite is expensive. | ||||
* | | Try to use Hash's native #[] for speed. | thedarkone | 2010-09-27 | 2 | -2/+8 |
| | | |||||
* | | Make InheritableOptions's constructor more flexible. | thedarkone | 2010-09-27 | 2 | -3/+7 |
| | | |||||
* | | Compile ActionController::Base.config's methods to avoid method_missing ↵ | thedarkone | 2010-09-27 | 3 | -2/+44 |
|/ | | | | overhead. | ||||
* | Fix 'warning: method redefined' [#5551 state:resolved] | Krekoten' Marjan | 2010-09-25 | 1 | -4/+4 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | memoized protected methods should remain protected | Andrew Kaspick | 2010-09-24 | 2 | -0/+16 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | attr_accessor_with_default should raise an ArgumentError not a RuntimeError | Aaron Patterson | 2010-09-24 | 2 | -4/+3 |
| | |||||
* | Use map, no need to use inject here. | Emilio Tagua | 2010-09-22 | 1 | -4/+1 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Perf: speed up json encoding. | Emilio Tagua | 2010-09-22 | 1 | -3/+2 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Refactor inject use in hash conversions. | Emilio Tagua | 2010-09-22 | 1 | -8/+2 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Exception handling more readable | Thiago Pradi | 2010-09-19 | 4 | -10/+10 |
| | | | | | | [#5601 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Use `Time.current` to maintain consistency with AS::Duration | Prem Sichanugrist | 2010-09-19 | 2 | -2/+40 |
| | | | | | | | | | | In [32b82e4c6f5523cdf5ee78c3022c50b46e018351], the committer has switch methods in AS::Duration to use `Time.current` to return the correct duration based on the `Time.default_zone` instead of using `Time.now`. [#5607 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Move capture to Kernel. [#5641 state:resolved] | Krekoten' Marjan | 2010-09-18 | 2 | -0/+24 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-09-14 | 1 | -3/+3 |
|\ | |||||
| * | Reference watch_namespaces in comments instead of watch_modules | Marcelo Giorgi | 2010-09-13 | 1 | -3/+3 |
| | | |||||
* | | Require lazy_load_hooks.rb with the correct path. | Carl Lerche | 2010-09-14 | 1 | -1/+1 |
| | | |||||
* | | require i18n in transliterate so it can run in isolated situations | Jack Dempsey | 2010-09-14 | 2 | -0/+2 |
| | | |||||
* | | Remove dummy method definition in favor of RDoc hints: | Aaron Patterson | 2010-09-11 | 1 | -7/+5 |
| | | | | | | | | http://rdoc.rubyforge.org/RDoc/Parser/Ruby.html | ||||
* | | fixed some issues with JSON encoding | Jakub Suder | 2010-09-07 | 2 | -7/+108 |
|/ | | | | | | | | | | | - as_json in ActiveModel should return a hash and handle :only/:except/:methods options - Array and Hash should call as_json on their elements - json methods should not modify options argument [#5374 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |