Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-14 | 21 | -274/+310 | |
|\| | | | | | | | | | | | | | | | 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 | 1 | -190/+135 | |
| | | | | | | | | 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 | 3 | -6/+14 | |
| | | | | | | | | anonymous? and constantize, and adds test coverage | |||||
| * | defines Module#anonymous? | Xavier Noria | 2010-02-11 | 2 | -1/+21 | |
| | | ||||||
| * | 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 | 3 | -0/+70 | |
| | | | | | | | | This reverts commits 7d312e54bad9c39634c137caec07dfc8df471650, 5f981ff0294ba45aa44ad15aa063970b29aeec44, f85f5dfc8ffefff174b695c6363211d342f77a57, 245bfafe335ff883f7a096eab95ac22fe2848679, and ec7c642f5fe60afc857aa64f1a9b4c2be56f9d70 | |||||
| * | removes Module#as_load_path, which is no longer used | Xavier Noria | 2010-02-07 | 2 | -26/+0 | |
| | | ||||||
| * | removes Module#included_in_classes, which is no longer used | Xavier Noria | 2010-02-07 | 2 | -31/+0 | |
| | | ||||||
| * | 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> | |||||
| * | Automatically prefer Yajl or JSON backend over Yaml, if available | Jeremy Kemper | 2010-02-05 | 1 | -1/+16 | |
| | | ||||||
| * | Add yajl-ruby as a JSON parsing backend | Brian Lopez | 2010-02-05 | 1 | -0/+40 | |
| | | | | | | | | | | | | [#2666 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | 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 | 4 | -14/+3 | |
|\| | | | | | | | | | Conflicts: railties/guides/source/3_0_release_notes.textile | |||||
| * | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-02-04 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Move to 3.0.0.beta | David Heinemeier Hansson | 2010-02-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Remove instrument! and require thread from AS::Notifications. | José Valim | 2010-02-04 | 3 | -13/+2 | |
| |/ | ||||||
* | | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | 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 | 3 | -25/+125 | |
| |\ | ||||||
| * | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-01 | 3 | -25/+125 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | 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 | 1 | -0/+36 | |
| | | | | | | | | | | | | 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. | |||||
| * | | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 1 | -21/+85 | |
| |/ | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-31 | 1 | -53/+27 | |
|\| | | | | | | | | | Conflicts: activemodel/lib/active_model/state_machine.rb | |||||
| * | superclass_delegating_accessor rewritten to serve as the base for many other ↵ | Yehuda Katz | 2010-01-29 | 1 | -53/+27 | |
| | | | | | | | | kinds of accessors (step 1 of unification) | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-28 | 161 | -18305/+122 | |
|\| | | | | | | | | | Conflicts: railties/lib/rails/railtie.rb | |||||
| * | Time#- with a DateTime argument behaves the same as with a Time argument, ↵ | Geoff Buesing | 2010-01-27 | 1 | -1/+1 | |
| | | | | | | | | i.e. returns the difference between self and arg as a Float [#3476 status:resolved] | |||||
| * | active_support/ordered_hash now requires yaml | snusnu | 2010-01-27 | 1 | -0/+2 | |
| | | ||||||
| * | Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a ↵ | Mikel Lindsaar | 2010-01-28 | 2 | -1152/+0 | |
| | | | | | | | | dependency - Don't forget to gem bundle buys and girls | |||||
| * | Unvendor'd Builder. Now requires the Builder gem as a dependency | Mikel Lindsaar | 2010-01-28 | 8 | -1041/+0 | |
| | | ||||||
| * | Unbundling TZInfo | Mikel Lindsaar | 2010-01-28 | 139 | -15983/+1 | |
| | | ||||||
| * | Adding custom yaml (de-)serialization for OrderedHash | Gregor Schmidt | 2010-01-27 | 1 | -1/+22 | |
| | | | | | | | | | | | | [#3608 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Update bundled TZInfo to v0.3.16 | Geoff Buesing | 2010-01-26 | 141 | -120/+122 | |
| | | ||||||
| * | Georgetown TimeZone is now mapped to "America/Guyana" instead of ↵ | Geoff Buesing | 2010-01-26 | 2 | -3/+27 | |
| | | | | | | | | "America/Argentina/San_Juan" [#1821 status:resolved] | |||||
| * | Merge remote branch 'fxn/master' | Jeremy Kemper | 2010-01-26 | 4 | -122/+0 | |
| |\ | ||||||
| | * | removes now void extending.rb | Xavier Noria | 2010-01-26 | 2 | -5/+0 | |
| | | | ||||||
| | * | removes Object#extended_by | Xavier Noria | 2010-01-26 | 1 | -4/+0 | |
| | | | ||||||
| | * | removes unused method Object#extend_with_included_modules_from | Xavier Noria | 2010-01-26 | 1 | -4/+0 | |
| | | |