Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into docrails | wycats | 2010-03-26 | 11 | -8/+54 |
|\ | |||||
| * | Add support for a type=binary with an optional encoding=base64. If the ↵ | Josh Franklin | 2010-03-26 | 1 | -0/+9 |
| | | | | | | | | | | | | encoding attribute is absent, the data is considered unencoded. [#2966 state:resolved] | ||||
| * | avoid active_support/core_ext/time/conversions.rb warnings | Santiago Pastorino | 2010-03-21 | 1 | -0/+1 |
| | | | | | | | | | | | | [#4250 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Singleton classes returns parent's methods with instance_methods(false) and ↵ | José Valim | 2010-03-19 | 1 | -1/+3 |
| | | | | | | | | this makes remove_method in Module#delegate fail. Add a test case and fix the bug. | ||||
| * | AS datetime conversions now require AS time conversions | snusnu | 2010-03-18 | 1 | -0/+1 |
| | | |||||
| * | Require AS singleton_class code in AS output_safety | snusnu | 2010-03-17 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Move require closer to home | Jeremy Kemper | 2010-03-17 | 1 | -0/+1 |
| | | |||||
| * | fixing activerecord tests [#4205 state:resolved] | Aaron Patterson | 2010-03-17 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix some more warnings on 1.9 | wycats | 2010-03-17 | 1 | -0/+2 |
| | | |||||
| * | Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵ | wycats | 2010-03-17 | 5 | -5/+23 |
| | | | | | | | | warnings are in dependencies. | ||||
| * | Eliminate warnings for AM on 1.8 | wycats | 2010-03-16 | 3 | -2/+13 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-15 | 1 | -5/+1 |
|\| | |||||
| * | to_str works here | Jeremy Kemper | 2010-03-15 | 1 | -5/+1 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 14 | -123/+71 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb | ||||
| * | Be sure to pass through args to to_yaml | Jeremy Kemper | 2010-03-11 | 1 | -2/+2 |
| | | |||||
| * | Write strings to fragment cache, not outputbuffers | Jeremy Kemper | 2010-03-11 | 1 | -1/+5 |
| | | |||||
| * | OutputBuffer#to_yaml should return string yaml, not some custom class dump | Jeremy Kemper | 2010-03-11 | 1 | -0/+4 |
| | | |||||
| * | class_attribute gets instance methods which delegate to but may override ↵ | Jeremy Kemper | 2010-03-08 | 1 | -2/+23 |
| | | | | | | | | their class values as you'd expect. Disable instance writer methods with :instance_writer => false. | ||||
| * | Make many parts of Rails lazy. In order to facilitate this, | wycats | 2010-03-07 | 2 | -92/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | add lazy_load_hooks.rb, which allows us to declare code that should be run at some later time. For instance, this allows us to defer requiring ActiveRecord::Base at boot time purely to apply configuration. Instead, we register a hook that should apply configuration once ActiveRecord::Base is loaded. With these changes, brings down total boot time of a new app to 300ms in production and 400ms in dev. TODO: rename base_hook | ||||
| * | Inflection dependency, [#4067 status:resolved] | Jason King | 2010-03-03 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Hash#symbolize_keys(!) optimizations | Lourens Naudé | 2010-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | [#3891 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | metaclass deprecated in 2.3.6 | Jeremy Kemper | 2010-02-25 | 2 | -15/+0 |
| | | |||||
| * | Missed singleton_class | Jeremy Kemper | 2010-02-25 | 1 | -0/+13 |
| | | |||||
| * | Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice. | Jeremy Kemper | 2010-02-25 | 4 | -16/+19 |
| | | |||||
| * | Commented metaprogramming turned out to be noisier not clearer | Jeremy Kemper | 2010-02-25 | 1 | -3/+3 |
| | | |||||
| * | Woops, forgot to actually add active_support/core_ext/file/path.rb | Carlhuda | 2010-02-23 | 1 | -0/+5 |
| | | |||||
| * | require publicize_conversion_method to ensure to_date and to_datetime became ↵ | Santiago Pastorino | 2010-02-19 | 1 | -0/+1 |
| | | | | | | | | public before redefining them (avoid warnings) | ||||
| * | Use FileUtils.mv instead of rename to copy in case of cross-device links | Jeremy Kemper | 2010-02-18 | 1 | -1/+2 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-14 | 15 | -74/+115 |
|\| | | | | | | | | | | | | | | | Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README | ||||
| * | 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> | ||||
| * | 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 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | fix usage examples and more to use new invocations | RomD | 2010-02-06 | 1 | -1/+1 |
| |/ | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.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> | ||||
* | | 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 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 | 2 | -21/+121 |
| |\ | |||||
| * | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-01 | 2 | -21/+121 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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. |