aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-022-2/+2
|\
| * Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-0210-78/+262
| |\
| * | Updating copyright dates on all licensesMikel Lindsaar2010-02-012-2/+2
* | | Merge remote branch 'mainstream/master'Pratik Naik2010-02-0115-93/+277
|\ \ \ | | |/ | |/|
| * | failing tests in multibyte_chars_test.rb fixedSantiago Pastorino2010-02-011-11/+11
| * | Convert to class_attributeJeremy Kemper2010-02-011-4/+4
| * | Introduce class_attribute to declare inheritable class attributes. Writing an...Jeremy Kemper2010-02-013-0/+85
| * | Deleted all references to ActionView::SafeBuffer in favor of ActiveSupport::S...Santiago Pastorino2010-01-311-0/+41
| * | For performance reasons, you can no longer call html_safe! on Strings. Instea...Yehuda Katz2010-01-313-54/+120
| * | Get rails tests running on bundler 0.9Carl Lerche2010-01-311-9/+1
| |/
| * deOMGifying Railties, Active Support, and Action PackMikel Lindsaar2010-01-315-15/+15
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-312-87/+27
|\|
| * superclass_delegating_accessor rewritten to serve as the base for many other ...Yehuda Katz2010-01-292-87/+27
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-28171-18567/+188
|\|
| * Ensure test sets json time format flagJeremy Kemper2010-01-281-1/+4
| * Time#- with a DateTime argument behaves the same as with a Time argument, i.e...Geoff Buesing2010-01-273-1/+7
| * active_support/ordered_hash now requires yamlsnusnu2010-01-271-0/+2
| * Remove unbundle changelogsJeremy Kemper2010-01-271-7/+1
| * Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a depend...Mikel Lindsaar2010-01-286-1157/+5
| * Unvendor'd Builder. Now requires the Builder gem as a dependencyMikel Lindsaar2010-01-2810-1041/+3
| * Unbundling TZInfoMikel Lindsaar2010-01-28142-16082/+4
| * Adding custom yaml (de-)serialization for OrderedHashGregor Schmidt2010-01-273-1/+48
| * Update bundled TZInfo to v0.3.16Geoff Buesing2010-01-26142-120/+124
| * Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Arg...Geoff Buesing2010-01-263-3/+29
| * Merge remote branch 'fxn/master'Jeremy Kemper2010-01-266-262/+0
| |\
| | * removes now void extending.rbXavier Noria2010-01-262-5/+0
| | * removes Object#extended_byXavier Noria2010-01-262-11/+0
| | * removes unused method Object#extend_with_included_modules_fromXavier Noria2010-01-262-19/+0
| | * deletes no void files removal.rb and class_test.rbXavier Noria2010-01-265-28/+0
| | * removes unused method Class#remove_classXavier Noria2010-01-262-48/+0
| | * removes unused method Class#reachable?Xavier Noria2010-01-261-5/+0
| | * removes unused Class#descedentsXavier Noria2010-01-261-34/+0
| | * removes unused Object#subclasses_ofXavier Noria2010-01-262-61/+0
| | * removes unused Object#remove_subclasses_ofXavier Noria2010-01-261-4/+0
| | * removes unused Class#remove_subclassesXavier Noria2010-01-262-30/+0
| | * removes unused method Class#subclassesXavier Noria2010-01-262-17/+0
| * | AC railtie should configure helpers path.José Valim2010-01-261-3/+3
| * | Merge remote branch 'mikel/master'José Valim2010-01-266-47/+52
| |\ \
| | * \ Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-241-0/+60
| | |\ \
| | * | | Speed up some Hash core extensions.José Valim and Mikel Lindsaar2010-01-242-16/+12
| | * | | Remove deprecated behavior since 2.3.José Valim and Mikel Lindsaar2010-01-242-30/+1
| | * | | Add uniq_by and uniq_by! to Array.José Valim and Mikel Lindsaar2010-01-243-3/+41
| * | | | Fix i18n locales order test.José Valim2010-01-251-1/+5
| | |_|/ | |/| |
| * | | Add active_model/railtie back to generated boot.rb, add models back to paths,...José Valim2010-01-251-27/+27
| | |/ | |/|
| * | Rename plugin_name to railtie_name and engine_name.José Valim2010-01-241-2/+2
| * | Add I18n tests to engines.José Valim2010-01-241-0/+2
| * | Get rid of initializers global and create i18n railtie.José Valim2010-01-231-0/+29
| * | Moved more configuration away from bootstrap.José Valim2010-01-221-0/+29
| |/
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-247-84/+46
|\|
| * Default to sync instrumentation.José Valim2010-01-212-50/+4