aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-02-1434-347/+496
|\
| * Missing requireYehuda Katz2010-02-141-0/+1
| * name.blank? -> anonymous? in a few placesXavier Noria2010-02-141-1/+1
| * adds a few missing requires in AS object.rb and module.rbXavier Noria2010-02-142-0/+6
| * Simplify dependencies.rb some. Remove alias of Kernel::Foo to Object::Foo as ...Yehuda Katz2010-02-142-201/+141
| * fixes Module#anonymous? for 1.9Xavier Noria2010-02-111-2/+6
| * moves Class#reachable? to Module#reachable?, bases implementation on anonymou...Xavier Noria2010-02-114-6/+55
| * defines Module#anonymous?Xavier Noria2010-02-113-1/+35
| * Since require_dependency cannot be cleared, remove the dependenciesYehuda Katz2010-02-101-0/+5
| * Fix a JSON ordering issueYehuda Katz2010-02-101-3/+7
| * No need to emulate default Ruby behavior in initializeYehuda Katz2010-02-101-3/+0
| * Don't rely on @message in Error classes being available for useYehuda Katz2010-02-101-4/+1
| * Reinstate object/extending require too for Object.subclasses_ofJeremy Kemper2010-02-091-0/+1
| * Reinstate Object.subclasses_of and Class#descendents for plugin compat.Jeremy Kemper2010-02-095-0/+149
| * Merge remote branch 'fxn/master'Jeremy Kemper2010-02-085-74/+0
| |\
| | * removes Module#as_load_path, which is no longer usedXavier Noria2010-02-074-36/+0
| | * removes Module#included_in_classes, which is no longer usedXavier Noria2010-02-073-38/+0
| * | Adding ruby version spec to all gemspec files to at least 1.8.7Mikel Lindsaar2010-02-081-0/+1
| |/
| * Fix doc typo and update fast_xs URL. Thanks to Dmitrii Golub.Jeremy Kemper2010-02-072-2/+2
| * 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
| * | fix usage examples and more to use new invocationsRomD2010-02-062-2/+2
| |/
| * Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' ...Prem Sichanugrist2010-02-061-1/+1
| * Making SafeBuffer << an alias for concat methodSantiago Pastorino2010-02-051-5/+2
| * Fixed html_safe test cases which weren't testing correctlySantiago Pastorino and José Ignacio Costa2010-02-051-17/+20
| * 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
| * 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
|\|
| * 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 1...José Valim2010-02-021-11/+11
* | 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