aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add backtrace cleaner on test unit railtie.José Valim2010-02-071-6/+0
| |
| * Merge remote branch 'fxn/master'Jeremy Kemper2010-02-062-8/+0
| |\
| | * removes Kernel#daemonize, which is no longer usedXavier Noria2010-02-062-8/+0
| | |
| * | remove trailing whitespaceRomD2010-02-061-1/+1
| | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| * | fix usage examples and more to use new invocationsRomD2010-02-062-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 Sichanugrist2010-02-061-1/+1
| | | | | | | | | | | | will be run correctly [#3879 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Making SafeBuffer << an alias for concat methodSantiago Pastorino2010-02-051-5/+2
| | | | | | | | | | | | [#3848 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fixed html_safe test cases which weren't testing correctlySantiago Pastorino and José Ignacio Costa2010-02-051-17/+20
| | | | | | | | | | | | [#3845 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Automatically prefer Yajl or JSON backend over Yaml, if availableJeremy Kemper2010-02-053-3/+18
| |
| * Add yajl-ruby as a JSON parsing backendBrian Lopez2010-02-053-0/+46
| | | | | | | | | | | | [#2666 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Bump git versions to 3.0.0.beta1 since we've releasedJeremy Kemper2010-02-051-1/+1
| |
| * Submarine the rake-gemcutter dep in RakefilesJeremy Kemper2010-02-051-4/+5
| |
| * Fix task definesJeremy Kemper2010-02-041-1/+1
| |
| * Release using gemcutter gem:push tasksJeremy Kemper2010-02-041-18/+5
| |
* | removes p calls in rdoc examplesXavier Noria2010-02-061-8/+8
| |
* | reformats an example in the rdoc of delegateXavier Noria2010-02-061-2/+7
| |
* | Merge remote branch 'mainstream/master'Pratik Naik2010-02-047-57/+30
|\| | | | | | | | | Conflicts: railties/guides/source/3_0_release_notes.textile
| * Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-02-042-16/+16
| |\
| | * Homogenize gemspecs and remove the deprecated autorequireDavid Heinemeier Hansson2010-02-031-15/+15
| | |
| | * Move to 3.0.0.betaDavid Heinemeier Hansson2010-02-032-2/+2
| | |
| * | Remove instrument! and require thread from AS::Notifications.José Valim2010-02-044-30/+3
| |/
| * Revert "failing tests in multibyte_chars_test.rb fixed". The bug is in Ruby ↵José Valim2010-02-021-11/+11
| | | | | | | | | | | | 1.9.1 p376, not in AS test suite. This reverts commit bf1f70d8776e28f9181faefc4914059b4ad26b99.
* | 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
| | |