Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix dependencies revealed by testing in isolation | Jeremy Kemper | 2009-04-22 | 61 | -32/+127 |
| | |||||
* | new_callbacks core extensions | Jeremy Kemper | 2009-04-22 | 2 | -5/+8 |
| | |||||
* | Fix tests on 1.9 | Jeremy Kemper | 2009-04-22 | 2 | -1/+3 |
| | |||||
* | Merge branch 'master' into cherry | Jeremy Kemper | 2009-04-22 | 2 | -1/+1 |
|\ | | | | | | | | | Conflicts: activesupport/lib/active_support.rb | ||||
| * | Opt in to JSON | Jeremy Kemper | 2009-04-22 | 2 | -1/+1 |
| | | |||||
* | | Opt in to Dependencies | Jeremy Kemper | 2009-04-22 | 7 | -10/+16 |
|/ | |||||
* | No more free lunch | Jeremy Kemper | 2009-04-22 | 4 | -4/+6 |
| | |||||
* | stdlib autoloads were hanging on 1.9.1 | Jeremy Kemper | 2009-04-22 | 3 | -9/+6 |
| | |||||
* | Divert CoreExtensions mention in docs | Jeremy Kemper | 2009-04-22 | 1 | -1/+1 |
| | |||||
* | Convert string extension modules to class reopens | Jeremy Kemper | 2009-04-22 | 6 | -291/+247 |
| | |||||
* | ActiveSupport.core_ext bridge util no longer used | Jeremy Kemper | 2009-04-22 | 1 | -10/+0 |
| | |||||
* | Switch last module core extension to class reopen | Jeremy Kemper | 2009-04-22 | 2 | -21/+6 |
| | |||||
* | Merge branch 'master' into cherry | Jeremy Kemper | 2009-04-20 | 33 | -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 Kemper | 2009-04-20 | 1 | -2/+14 |
| | | | | | | | | instead of '' | ||||
| * | Treating strings as enumerable is deprecated | Jeremy Kemper | 2009-04-20 | 1 | -6/+6 |
| | | |||||
| * | Clearer String#first and #last edge cases. Fix that foo.first(0) == instead ↵ | Jeremy Kemper | 2009-04-17 | 2 | -3/+17 |
| | | | | | | | | of foo. | ||||
| * | Resurrecting 1.9 compatibility. | Carl Lerche & Yehuda Katz | 2009-04-13 | 4 | -3/+5 |
| | | |||||
| * | Bring abstract_controller up to date with rails/master | Carl Lerche & Yehuda Katz | 2009-04-13 | 78 | -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 cleanup | Geoff Buesing | 2009-04-05 | 1 | -3/+3 |
| | | | |||||
| | * | Hash::XML_TYPE_NAMES: no longer a need for a TimeWithZone entry; this class ↵ | Geoff Buesing | 2009-04-05 | 1 | -2/+1 |
| | | | | | | | | | | | | will now match "Time" | ||||
| | * | TimeWithZone.name returns 'Time', to further thwart type checking | Geoff Buesing | 2009-04-05 | 3 | -0/+11 |
| | | | |||||
| | * | Nicer name for anonymous local cache middleware class | Joshua Peek | 2009-04-02 | 1 | -0/+5 |
| | | | |||||
| | * | Enhance Time #since and #ago DST tests. | Geoff Buesing | 2009-03-29 | 1 | -16/+57 |
| | | | |||||
| | * | Time.local instances: Adding 24.hours across the DST boundary adds 24 hours ↵ | Michael Curtis | 2009-03-29 | 4 | -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 Katz | 2009-04-09 | 2 | -310/+306 |
| | | | |||||
| * | | Updated old AC::Base for small changes to AV | Yehuda Katz and Carl Lerche | 2009-04-08 | 1 | -2/+2 |
| | | | |||||
| * | | Layouts work in AbstractController. Add support for the rspec runner for T::U | Yehuda Katz and Carl Lerche | 2009-04-07 | 2 | -33/+61 |
| | | | |||||
| * | | Add depends_on, use, and setup to abstract up ideas about module inheritance. | Yehuda Katz and Carl Lerche | 2009-04-07 | 2 | -0/+27 |
| | | | |||||
| * | | Changes necessary to run the T::U tests with the rspec runner | Yehuda Katz and Carl Lerche | 2009-04-06 | 1 | -2/+10 |
| | | | |||||
| * | | Rework NewCallbacks to not require method_missing | Yehuda Katz | 2009-03-17 | 1 | -1/+9 |
| | | | |||||
| * | | Use extlib accessor for new callbacks | Yehuda Katz | 2009-03-12 | 1 | -2/+2 |
| | | | |||||
| * | | Helpers with an initial test | Yehuda Katz | 2009-03-03 | 1 | -3/+3 |
| | | | |||||
| * | | Fixes multiple conditions | Yehuda Katz | 2009-02-27 | 1 | -2/+2 |
| | | | |||||
| * | | Add support for callbacks | Yehuda Katz | 2009-02-27 | 4 | -0/+975 |
| | | | |||||
| * | | First, very early, AbstractController code. More to come | Yehuda Katz | 2009-02-24 | 1 | -0/+79 |
| | | | |||||
| * | | Make tests pass | Yehuda Katz | 2009-02-02 | 1 | -121/+0 |
| | | | |||||
| * | | Whoops. | Yehuda Katz | 2009-02-02 | 1 | -0/+40 |
| | | | |||||
| * | | Add support for pending | Yehuda Katz | 2009-02-02 | 1 | -0/+2 |
| | | | |||||
| * | | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-02-02 | 1 | -25/+0 |
| |\ \ | |||||
| | * | | Remove duplicate ConcurrentHash | Jeremy Kemper | 2009-01-31 | 1 | -25/+0 |
| | | | | |||||
| * | | | Some merge cleanup | Yehuda Katz | 2009-02-02 | 1 | -0/+121 |
| | | | | |||||
| * | | | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 3 | -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 structure | Joshua Peek | 2009-01-27 | 1 | -0/+38 |
| | | | | |||||
| | * | | Begin unifying the interface between ActionController and ActionView | Yehuda Katz | 2009-01-22 | 15 | -44/+84 |
| | | | | |||||
| * | | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-30 | 25 | -68/+362 |
| |\ \ \ | |||||
| * \ \ \ | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-13 | 2 | -10/+11 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-11 | 3 | -2/+17 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Object#tap for Ruby < 1.8.7 | Jeremy Kemper | 2009-01-09 | 3 | -0/+26 |
| | | | | | | | | |||||
| * | | | | | | | Fix JSON decoder date-converter regexp [#1662 state:resolved] [Jonathan del ↵ | Pratik Naik | 2009-01-09 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strother] |