aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-022-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/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
| | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * | Convert to class_attributeJeremy Kemper2010-02-011-4/+4
| | |
| * | Introduce class_attribute to declare inheritable class attributes. Writing ↵Jeremy Kemper2010-02-013-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 Pastorino2010-01-311-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 Katz2010-01-313-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.
| * | 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
|\| | | | | | | | | Conflicts: activemodel/lib/active_model/state_machine.rb
| * superclass_delegating_accessor rewritten to serve as the base for many other ↵Yehuda Katz2010-01-292-87/+27
| | | | | | | | kinds of accessors (step 1 of unification)
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-28171-18567/+188
|\| | | | | | | | | Conflicts: railties/lib/rails/railtie.rb
| * 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, ↵Geoff Buesing2010-01-273-1/+7
| | | | | | | | i.e. returns the difference between self and arg as a Float [#3476 status:resolved]
| * 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 ↵Mikel Lindsaar2010-01-286-1157/+5
| | | | | | | | dependency - Don't forget to gem bundle buys and girls
| * 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
| | | | | | | | | | | | [#3608 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Update bundled TZInfo to v0.3.16Geoff Buesing2010-01-26142-120/+124
| |
| * Georgetown TimeZone is now mapped to "America/Guyana" instead of ↵Geoff Buesing2010-01-263-3/+29
| | | | | | | | "America/Argentina/San_Juan" [#1821 status:resolved]
| * 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 ↵José Valim2010-01-251-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é 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 18:47:41 +0000