| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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 | 4 | -25/+126 | |
| | |\ | ||||||
| | * | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-01 | 4 | -25/+126 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | 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 | 2 | -21/+86 | |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | 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 | 162 | -18307/+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 | 3 | -1154/+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 | |
| | | | | ||||||
| | | * | deletes no void files removal.rb and class_test.rb | Xavier Noria | 2010-01-26 | 3 | -7/+0 | |
| | | | | ||||||
| | | * | removes unused method Class#remove_class | Xavier Noria | 2010-01-26 | 1 | -31/+0 | |
| | | | | ||||||
| | | * | removes unused method Class#reachable? | Xavier Noria | 2010-01-26 | 1 | -5/+0 | |
| | | | | ||||||
| | | * | removes unused Class#descedents | Xavier Noria | 2010-01-26 | 1 | -34/+0 | |
| | | | | ||||||
| | | * | removes unused Object#subclasses_of | Xavier Noria | 2010-01-26 | 1 | -12/+0 | |
| | | | | ||||||
| | | * | removes unused Object#remove_subclasses_of | Xavier Noria | 2010-01-26 | 1 | -4/+0 | |
| | | | | ||||||
| | | * | removes unused Class#remove_subclasses | Xavier Noria | 2010-01-26 | 1 | -9/+0 | |
| | | | | ||||||
| | | * | removes unused method Class#subclasses | Xavier Noria | 2010-01-26 | 1 | -7/+0 | |
| | | | | ||||||
| | * | | AC railtie should configure helpers path. | José Valim | 2010-01-26 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | Merge remote branch 'mikel/master' | José Valim | 2010-01-26 | 5 | -29/+30 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' of github.com:mikel/rails | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -0/+60 | |
| | | |\ \ | ||||||
| | | * | | | Speed up some Hash core extensions. | José Valim and Mikel Lindsaar | 2010-01-24 | 2 | -16/+12 | |
| | | | | | | ||||||
| | | * | | | Remove deprecated behavior since 2.3. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -13/+0 | |
| | | | | | | ||||||
| | | * | | | Add uniq_by and uniq_by! to Array. | José Valim and Mikel Lindsaar | 2010-01-24 | 2 | -0/+18 | |
| | | | | | | ||||||
| | * | | | | Fix i18n locales order test. | José Valim | 2010-01-25 | 1 | -1/+5 | |
| | | |_|/ | |/| | | ||||||
| | * | | | Add active_model/railtie back to generated boot.rb, add models back to ↵ | José Valim | 2010-01-25 | 1 | -27/+27 | |
| | | |/ | |/| | | | | | | | paths, load active_support/railtie since we need it and ensure default logger is set before config. | |||||
| | * | | Rename plugin_name to railtie_name and engine_name. | José Valim | 2010-01-24 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Add I18n tests to engines. | José Valim | 2010-01-24 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Get rid of initializers global and create i18n railtie. | José Valim | 2010-01-23 | 1 | -0/+29 | |
| | | | | ||||||
| | * | | Moved more configuration away from bootstrap. | José Valim | 2010-01-22 | 1 | -0/+29 | |
| | |/ | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |