aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix dependencies revealed by testing in isolationJeremy Kemper2009-04-2261-32/+127
|
* new_callbacks core extensionsJeremy Kemper2009-04-222-5/+8
|
* Fix tests on 1.9Jeremy Kemper2009-04-222-1/+3
|
* Merge branch 'master' into cherryJeremy Kemper2009-04-222-1/+1
|\ | | | | | | | | Conflicts: activesupport/lib/active_support.rb
| * Opt in to JSONJeremy Kemper2009-04-222-1/+1
| |
* | Opt in to DependenciesJeremy Kemper2009-04-227-10/+16
|/
* No more free lunchJeremy Kemper2009-04-224-4/+6
|
* stdlib autoloads were hanging on 1.9.1Jeremy Kemper2009-04-223-9/+6
|
* Divert CoreExtensions mention in docsJeremy Kemper2009-04-221-1/+1
|
* Convert string extension modules to class reopensJeremy Kemper2009-04-226-291/+247
|
* ActiveSupport.core_ext bridge util no longer usedJeremy Kemper2009-04-221-10/+0
|
* Switch last module core extension to class reopenJeremy Kemper2009-04-222-21/+6
|
* Merge branch 'master' into cherryJeremy Kemper2009-04-2033-95/+1402
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/CHANGELOG activesupport/lib/active_support/core_ext/class/delegating_attributes.rb activesupport/lib/active_support/core_ext/hash/conversions.rb activesupport/lib/active_support/core_ext/module/attribute_accessors.rb activesupport/lib/active_support/core_ext/string/multibyte.rb activesupport/lib/active_support/core_ext/time/calculations.rb activesupport/lib/active_support/deprecation.rb
| * Clearer String#first and #last edge cases. Fix that 'foo'.first(0) == 'foo' ↵Jeremy Kemper2009-04-201-2/+14
| | | | | | | | instead of ''
| * Treating strings as enumerable is deprecatedJeremy Kemper2009-04-201-6/+6
| |
| * Clearer String#first and #last edge cases. Fix that foo.first(0) == instead ↵Jeremy Kemper2009-04-172-3/+17
| | | | | | | | of foo.
| * Resurrecting 1.9 compatibility.Carl Lerche & Yehuda Katz2009-04-134-3/+5
| |
| * Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1378-824/+1521
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| | * Test cleanupGeoff Buesing2009-04-051-3/+3
| | |
| | * Hash::XML_TYPE_NAMES: no longer a need for a TimeWithZone entry; this class ↵Geoff Buesing2009-04-051-2/+1
| | | | | | | | | | | | will now match "Time"
| | * TimeWithZone.name returns 'Time', to further thwart type checkingGeoff Buesing2009-04-053-0/+11
| | |
| | * Nicer name for anonymous local cache middleware classJoshua Peek2009-04-021-0/+5
| | |
| | * Enhance Time #since and #ago DST tests.Geoff Buesing2009-03-291-16/+57
| | |
| | * Time.local instances: Adding 24.hours across the DST boundary adds 24 hours ↵Michael Curtis2009-03-294-27/+36
| | | | | | | | | | | | instead of one day [#2066 state:resolved]
| * | Revert rspec-runner change. TODO: Add back support for the rspec T::U runner.Carl Lerche & Yehuda Katz2009-04-092-310/+306
| | |
| * | Updated old AC::Base for small changes to AVYehuda Katz and Carl Lerche2009-04-081-2/+2
| | |
| * | Layouts work in AbstractController. Add support for the rspec runner for T::UYehuda Katz and Carl Lerche2009-04-072-33/+61
| | |
| * | Add depends_on, use, and setup to abstract up ideas about module inheritance.Yehuda Katz and Carl Lerche2009-04-072-0/+27
| | |
| * | Changes necessary to run the T::U tests with the rspec runnerYehuda Katz and Carl Lerche2009-04-061-2/+10
| | |
| * | Rework NewCallbacks to not require method_missingYehuda Katz2009-03-171-1/+9
| | |
| * | Use extlib accessor for new callbacksYehuda Katz2009-03-121-2/+2
| | |
| * | Helpers with an initial testYehuda Katz2009-03-031-3/+3
| | |
| * | Fixes multiple conditionsYehuda Katz2009-02-271-2/+2
| | |
| * | Add support for callbacksYehuda Katz2009-02-274-0/+975
| | |
| * | First, very early, AbstractController code. More to comeYehuda Katz2009-02-241-0/+79
| | |
| * | Make tests passYehuda Katz2009-02-021-121/+0
| | |
| * | Whoops.Yehuda Katz2009-02-021-0/+40
| | |
| * | Add support for pendingYehuda Katz2009-02-021-0/+2
| | |
| * | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-02-021-25/+0
| |\ \
| | * | Remove duplicate ConcurrentHashJeremy Kemper2009-01-311-25/+0
| | | |
| * | | Some merge cleanupYehuda Katz2009-02-021-0/+121
| | | |
| * | | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-303-0/+65
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| | * | Reorganize ActionController folder structureJoshua Peek2009-01-271-0/+38
| | | |
| | * | Begin unifying the interface between ActionController and ActionViewYehuda Katz2009-01-2215-44/+84
| | | |
| * | | Sync 'rails/rails/master'Yehuda Katz2009-01-3025-68/+362
| |\ \ \
| * \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-132-10/+11
| |\ \ \ \
| * \ \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-113-2/+17
| |\ \ \ \ \
| * \ \ \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-091-1/+1
| |\ \ \ \ \ \
| * | | | | | | Object#tap for Ruby < 1.8.7Jeremy Kemper2009-01-093-0/+26
| | | | | | | |
| * | | | | | | Fix JSON decoder date-converter regexp [#1662 state:resolved] [Jonathan del ↵Pratik Naik2009-01-092-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strother]