aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Remove stray call to gems:unpack in gems:build:forceMatt Jones2009-05-061-2/+1
| | | | | | | | | | | | [#2266 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix tests on 1.8.6Jeremy Kemper2009-05-062-0/+2
| |
| * Fix old reference to ActionController::FailsafeJeremy Kemper2009-05-061-1/+1
| |
| * Cherry pick Active Support dependencies. Autoload.Jeremy Kemper2009-05-0611-81/+100
| |
| * Remove superfluous CGI requireJeremy Kemper2009-05-051-1/+0
| |
| * Prefer sibling Active SupportJeremy Kemper2009-05-051-9/+3
| |
| * Cherry-pick the inflector onlyJeremy Kemper2009-05-051-11/+2
| |
| * assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵Joshua Peek2009-05-041-7/+0
| | | | | | | | 7f1f16c01
| * fix problems with requires in metal choking under development reloading ↵Tim Connor2009-05-041-1/+2
| | | | | | | | | | | | [#2579 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fix consoleJoshua Peek2009-05-041-2/+3
| |
| * Providing support for :inverse_of as an option to associations.Murray Steele2009-05-0418-12/+418
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now add an :inverse_of option to has_one, has_many and belongs_to associations. This is best described with an example: class Man < ActiveRecord::Base has_one :face, :inverse_of => :man end class Face < ActiveRecord::Base belongs_to :man, :inverse_of => :face end m = Man.first f = m.face Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again). With these new :inverse_of options m and f.man are the same in memory instance. Currently :inverse_of supports has_one and has_many (but not the :through variants) associations. It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic. Signed-off-by: Murray Steele <muz@h-lame.com> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fixed Hash#from_xml with keys that are all caps.codebrulee2009-05-042-1/+17
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-0430-592/+422
| |\
| | * Wrap dispatcher callbacks around the whole middleware chain. Kill ↵Joshua Peek2009-05-033-38/+22
| | | | | | | | | | | | unnecessary Reloader middleware.
| | * Show lazy middleware args in pretty printJoshua Peek2009-05-031-2/+1
| | |
| | * Extract ActionController rescue templates into Rescue and ShowExceptions ↵Joshua Peek2009-05-0228-556/+403
| | | | | | | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
| * | Don't use #tap before Active Support is available, since older versions of ↵Chris Kampmeier2009-05-041-3/+2
| |/ | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-0221-105/+132
| |\
| | * Deprecate Controller.process interfaceJoshua Peek2009-05-023-10/+13
| | |
| | * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-027-10/+28
| | |
| | * Functional test runner finalizes response just like the integration test ↵Joshua Peek2009-05-029-58/+66
| | | | | | | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response.
| | * Deprecate assert_redirect_to's partial hash matchingJoshua Peek2009-05-028-28/+26
| | |
| * | Check for sibling Active Support firstJeremy Kemper2009-05-021-8/+3
| |/
* | Fixed a bug with handling render optionsYehuda Katz + Carl Lerche2009-05-113-66/+12
| |
* | Aliased AbstractController::ActionNotFound to ActionController::UnknownActionYehuda Katz + Carl Lerche2009-05-114-10/+12
| |
* | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-117-5/+102
| |
* | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-113-5/+13
| | | | | | In AbstractController, this means that response_body is not empty
* | Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-110-0/+0
|\ \
| * | Makes new callbacks support keys with special charactersYehuda Katz + Carl Lerche2009-04-272-0/+29
| | |
* | | Ported fresh_when into a ConditionalGet moduleYehuda Katz + Carl Lerche2009-05-115-0/+92
| | |
* | | More community code review :)Yehuda Katz2009-05-118-43/+37
| | |
* | | Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
| | |
* | | Implement FooController.action(:name)Yehuda Katz2009-05-027-34/+57
| | | | | | | | | | | | | | | | | | * Rails actions are now Rack endpoints, and can be retrieved via FooController.action(name) and called with an env * Updated some tests that relied on the old internal #process/#call implementation
* | | Get render :inline workingYehuda Katz + Carl Lerche2009-05-013-2/+6
| | |
* | | A few more tweaks to get new Base running old render tests againYehuda Katz + Carl Lerche2009-05-013-17/+10
| | |
* | | Renamed Base2 to Base and don't require old action_controller for new BaseYehuda Katz + Carl Lerche2009-05-0113-141/+157
| | |
* | | Starting to get new_base to run on old testsYehuda Katz + Carl Lerche2009-05-018-3/+313
| | |
* | | Add support for stripping "layouts/" from the layout name Yehuda Katz + Carl Lerche2009-05-012-0/+8
| | |
* | | Modify new_base to use String action_names for back-compatYehuda Katz + Carl Lerche2009-05-014-8/+8
| | |
* | | Committing the last changes before we start trying to get the old tests to ↵Yehuda Katz + Carl Lerche2009-05-013-7/+70
| | | | | | | | | | | | pass on the new base
* | | Ported over the concept of public instance methods on controller child ↵Yehuda Katz + Carl Lerche2009-05-015-20/+69
| | | | | | | | | | | | classes as callable action methods
* | | Move ContentType inline for now. Yehuda Katz + Carl Lerche2009-05-014-21/+6
| | | | | | | | | | | | Trying to avoid premature proliferation of modules.
* | | Support implicit and explicit content typesYehuda Katz + Carl Lerche2009-05-016-2/+139
| | |
* | | Support implicit render and blank renderYehuda Katz + Carl Lerche2009-05-016-27/+69
| | |
* | | Ported over render :template testsYehuda Katz + Carl Lerche2009-05-016-8/+39
| | |
* | | Finished implementing render :text in Base2Yehuda Katz + Carl Lerche2009-05-016-8/+54
| | |
* | | Renamed the new_base testsYehuda Katz + Carl Lerche2009-05-014-94/+98
| | |
* | | Renamed ActionController::AbstractBase to ActionController::HttpYehuda Katz + Carl Lerche2009-05-014-18/+18
| | |
* | | Removed a stray method_missing in the new callbacks systemYehuda Katz + Carl Lerche2009-05-011-9/+0
| | |