Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-14 | 34 | -347/+496 |
|\ | | | | | | | | | | | | | | | Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README | ||||
| * | Missing require | Yehuda Katz | 2010-02-14 | 1 | -0/+1 |
| | | |||||
| * | name.blank? -> anonymous? in a few places | Xavier Noria | 2010-02-14 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | adds a few missing requires in AS object.rb and module.rb | Xavier Noria | 2010-02-14 | 2 | -0/+6 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | Simplify dependencies.rb some. Remove alias of Kernel::Foo to Object::Foo as ↵ | Yehuda Katz | 2010-02-14 | 2 | -201/+141 |
| | | | | | | | | it was not used and breaks Ruby semantics. | ||||
| * | fixes Module#anonymous? for 1.9 | Xavier Noria | 2010-02-11 | 1 | -2/+6 |
| | | |||||
| * | moves Class#reachable? to Module#reachable?, bases implementation on ↵ | Xavier Noria | 2010-02-11 | 4 | -6/+55 |
| | | | | | | | | anonymous? and constantize, and adds test coverage | ||||
| * | defines Module#anonymous? | Xavier Noria | 2010-02-11 | 3 | -1/+35 |
| | | |||||
| * | Since require_dependency cannot be cleared, remove the dependencies | Yehuda Katz | 2010-02-10 | 1 | -0/+5 |
| | | |||||
| * | Fix a JSON ordering issue | Yehuda Katz | 2010-02-10 | 1 | -3/+7 |
| | | |||||
| * | No need to emulate default Ruby behavior in initialize | Yehuda Katz | 2010-02-10 | 1 | -3/+0 |
| | | |||||
| * | Don't rely on @message in Error classes being available for use | Yehuda Katz | 2010-02-10 | 1 | -4/+1 |
| | | |||||
| * | Reinstate object/extending require too for Object.subclasses_of | Jeremy Kemper | 2010-02-09 | 1 | -0/+1 |
| | | |||||
| * | Reinstate Object.subclasses_of and Class#descendents for plugin compat. | Jeremy Kemper | 2010-02-09 | 5 | -0/+149 |
| | | | | | | | | This reverts commits 7d312e54bad9c39634c137caec07dfc8df471650, 5f981ff0294ba45aa44ad15aa063970b29aeec44, f85f5dfc8ffefff174b695c6363211d342f77a57, 245bfafe335ff883f7a096eab95ac22fe2848679, and ec7c642f5fe60afc857aa64f1a9b4c2be56f9d70 | ||||
| * | Merge remote branch 'fxn/master' | Jeremy Kemper | 2010-02-08 | 5 | -74/+0 |
| |\ | |||||
| | * | removes Module#as_load_path, which is no longer used | Xavier Noria | 2010-02-07 | 4 | -36/+0 |
| | | | |||||
| | * | removes Module#included_in_classes, which is no longer used | Xavier Noria | 2010-02-07 | 3 | -38/+0 |
| | | | |||||
| * | | Adding ruby version spec to all gemspec files to at least 1.8.7 | Mikel Lindsaar | 2010-02-08 | 1 | -0/+1 |
| |/ | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fix doc typo and update fast_xs URL. Thanks to Dmitrii Golub. | Jeremy Kemper | 2010-02-07 | 2 | -2/+2 |
| | | |||||
| * | Add backtrace cleaner on test unit railtie. | José Valim | 2010-02-07 | 1 | -6/+0 |
| | | |||||
| * | Merge remote branch 'fxn/master' | Jeremy Kemper | 2010-02-06 | 2 | -8/+0 |
| |\ | |||||
| | * | removes Kernel#daemonize, which is no longer used | Xavier Noria | 2010-02-06 | 2 | -8/+0 |
| | | | |||||
| * | | remove trailing whitespace | RomD | 2010-02-06 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
| * | | fix usage examples and more to use new invocations | RomD | 2010-02-06 | 2 | -2/+2 |
| |/ | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
| * | Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' ↵ | Prem Sichanugrist | 2010-02-06 | 1 | -1/+1 |
| | | | | | | | | | | | | will be run correctly [#3879 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Making SafeBuffer << an alias for concat method | Santiago Pastorino | 2010-02-05 | 1 | -5/+2 |
| | | | | | | | | | | | | [#3848 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fixed html_safe test cases which weren't testing correctly | Santiago Pastorino and José Ignacio Costa | 2010-02-05 | 1 | -17/+20 |
| | | | | | | | | | | | | [#3845 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Automatically prefer Yajl or JSON backend over Yaml, if available | Jeremy Kemper | 2010-02-05 | 3 | -3/+18 |
| | | |||||
| * | Add yajl-ruby as a JSON parsing backend | Brian Lopez | 2010-02-05 | 3 | -0/+46 |
| | | | | | | | | | | | | [#2666 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Bump git versions to 3.0.0.beta1 since we've released | Jeremy Kemper | 2010-02-05 | 1 | -1/+1 |
| | | |||||
| * | Submarine the rake-gemcutter dep in Rakefiles | Jeremy Kemper | 2010-02-05 | 1 | -4/+5 |
| | | |||||
| * | Fix task defines | Jeremy Kemper | 2010-02-04 | 1 | -1/+1 |
| | | |||||
| * | Release using gemcutter gem:push tasks | Jeremy Kemper | 2010-02-04 | 1 | -18/+5 |
| | | |||||
* | | removes p calls in rdoc examples | Xavier Noria | 2010-02-06 | 1 | -8/+8 |
| | | |||||
* | | reformats an example in the rdoc of delegate | Xavier Noria | 2010-02-06 | 1 | -2/+7 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-04 | 7 | -57/+30 |
|\| | | | | | | | | | Conflicts: railties/guides/source/3_0_release_notes.textile | ||||
| * | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-02-04 | 2 | -16/+16 |
| |\ | |||||
| | * | Homogenize gemspecs and remove the deprecated autorequire | David Heinemeier Hansson | 2010-02-03 | 1 | -15/+15 |
| | | | |||||
| | * | Move to 3.0.0.beta | David Heinemeier Hansson | 2010-02-03 | 2 | -2/+2 |
| | | | |||||
| * | | Remove instrument! and require thread from AS::Notifications. | José Valim | 2010-02-04 | 4 | -30/+3 |
| |/ | |||||
| * | Revert "failing tests in multibyte_chars_test.rb fixed". The bug is in Ruby ↵ | José Valim | 2010-02-02 | 1 | -11/+11 |
| | | | | | | | | | | | | 1.9.1 p376, not in AS test suite. This reverts commit bf1f70d8776e28f9181faefc4914059b4ad26b99. | ||||
* | | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 2 | -2/+2 |
|\| | | | | | | | | | | | | | | | Conflicts: activemodel/README activemodel/lib/active_model/errors.rb activemodel/lib/active_model/serialization.rb railties/guides/source/3_0_release_notes.textile | ||||
| * | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 10 | -78/+262 |
| |\ | |||||
| * | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 2 | -2/+2 |
| | | | |||||
* | | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-01 | 15 | -93/+277 |
|\ \ \ | | |/ | |/| | |||||
| * | | failing tests in multibyte_chars_test.rb fixed | Santiago Pastorino | 2010-02-01 | 1 | -11/+11 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | | Convert to class_attribute | Jeremy Kemper | 2010-02-01 | 1 | -4/+4 |
| | | | |||||
| * | | Introduce class_attribute to declare inheritable class attributes. Writing ↵ | Jeremy Kemper | 2010-02-01 | 3 | -0/+85 |
| | | | | | | | | | | | | an attribute on a subclass behaves just like overriding the superclass reader method. Unifies and replaces most usage of cattr_accessor, class_inheritable_attribute, superclass_delegating_attribute, and extlib_inheritable_attribute. | ||||
| * | | Deleted all references to ActionView::SafeBuffer in favor of ↵ | Santiago Pastorino | 2010-01-31 | 1 | -0/+41 |
| | | | | | | | | | | | | | | | | | | ActiveSupport::SafeBuffer Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 3 | -54/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe. |