Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Remove stray call to gems:unpack in gems:build:force | Matt Jones | 2009-05-06 | 1 | -2/+1 | |
| | | | | | | | | | | | | [#2266 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Fix tests on 1.8.6 | Jeremy Kemper | 2009-05-06 | 2 | -0/+2 | |
| | | ||||||
| * | Fix old reference to ActionController::Failsafe | Jeremy Kemper | 2009-05-06 | 1 | -1/+1 | |
| | | ||||||
| * | Cherry pick Active Support dependencies. Autoload. | Jeremy Kemper | 2009-05-06 | 11 | -81/+100 | |
| | | ||||||
| * | Remove superfluous CGI require | Jeremy Kemper | 2009-05-05 | 1 | -1/+0 | |
| | | ||||||
| * | Prefer sibling Active Support | Jeremy Kemper | 2009-05-05 | 1 | -9/+3 | |
| | | ||||||
| * | Cherry-pick the inflector only | Jeremy Kemper | 2009-05-05 | 1 | -11/+2 | |
| | | ||||||
| * | assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵ | Joshua Peek | 2009-05-04 | 1 | -7/+0 | |
| | | | | | | | | 7f1f16c01 | |||||
| * | fix problems with requires in metal choking under development reloading ↵ | Tim Connor | 2009-05-04 | 1 | -1/+2 | |
| | | | | | | | | | | | | [#2579 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Fix console | Joshua Peek | 2009-05-04 | 1 | -2/+3 | |
| | | ||||||
| * | Providing support for :inverse_of as an option to associations. | Murray Steele | 2009-05-04 | 18 | -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. | codebrulee | 2009-05-04 | 2 | -1/+17 | |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-04 | 30 | -592/+422 | |
| |\ | ||||||
| | * | Wrap dispatcher callbacks around the whole middleware chain. Kill ↵ | Joshua Peek | 2009-05-03 | 3 | -38/+22 | |
| | | | | | | | | | | | | unnecessary Reloader middleware. | |||||
| | * | Show lazy middleware args in pretty print | Joshua Peek | 2009-05-03 | 1 | -2/+1 | |
| | | | ||||||
| | * | Extract ActionController rescue templates into Rescue and ShowExceptions ↵ | Joshua Peek | 2009-05-02 | 28 | -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 Kampmeier | 2009-05-04 | 1 | -3/+2 | |
| |/ | | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Fix implicit ordering expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-02 | 21 | -105/+132 | |
| |\ | ||||||
| | * | Deprecate Controller.process interface | Joshua Peek | 2009-05-02 | 3 | -10/+13 | |
| | | | ||||||
| | * | Switch functional tests to run through the rack interface instead of process | Joshua Peek | 2009-05-02 | 7 | -10/+28 | |
| | | | ||||||
| | * | Functional test runner finalizes response just like the integration test ↵ | Joshua Peek | 2009-05-02 | 9 | -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 matching | Joshua Peek | 2009-05-02 | 8 | -28/+26 | |
| | | | ||||||
| * | | Check for sibling Active Support first | Jeremy Kemper | 2009-05-02 | 1 | -8/+3 | |
| |/ | ||||||
* | | Fixed a bug with handling render options | Yehuda Katz + Carl Lerche | 2009-05-11 | 3 | -66/+12 | |
| | | ||||||
* | | Aliased AbstractController::ActionNotFound to ActionController::UnknownAction | Yehuda Katz + Carl Lerche | 2009-05-11 | 4 | -10/+12 | |
| | | ||||||
* | | Ported ConditionalGet to new Base | Yehuda Katz + Carl Lerche | 2009-05-11 | 7 | -5/+102 | |
| | | ||||||
* | | Don't run the action if callbacks are halted. | Yehuda Katz + Carl Lerche | 2009-05-11 | 3 | -5/+13 | |
| | | | | | | In AbstractController, this means that response_body is not empty | |||||
* | | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 0 | -0/+0 | |
|\ \ | ||||||
| * | | Makes new callbacks support keys with special characters | Yehuda Katz + Carl Lerche | 2009-04-27 | 2 | -0/+29 | |
| | | | ||||||
* | | | Ported fresh_when into a ConditionalGet module | Yehuda Katz + Carl Lerche | 2009-05-11 | 5 | -0/+92 | |
| | | | ||||||
* | | | More community code review :) | Yehuda Katz | 2009-05-11 | 8 | -43/+37 | |
| | | | ||||||
* | | | Fix implicit ordering expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Implement FooController.action(:name) | Yehuda Katz | 2009-05-02 | 7 | -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 working | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -2/+6 | |
| | | | ||||||
* | | | A few more tweaks to get new Base running old render tests again | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -17/+10 | |
| | | | ||||||
* | | | Renamed Base2 to Base and don't require old action_controller for new Base | Yehuda Katz + Carl Lerche | 2009-05-01 | 13 | -141/+157 | |
| | | | ||||||
* | | | Starting to get new_base to run on old tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 8 | -3/+313 | |
| | | | ||||||
* | | | Add support for stripping "layouts/" from the layout name | Yehuda Katz + Carl Lerche | 2009-05-01 | 2 | -0/+8 | |
| | | | ||||||
* | | | Modify new_base to use String action_names for back-compat | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -8/+8 | |
| | | | ||||||
* | | | Committing the last changes before we start trying to get the old tests to ↵ | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -7/+70 | |
| | | | | | | | | | | | | pass on the new base | |||||
* | | | Ported over the concept of public instance methods on controller child ↵ | Yehuda Katz + Carl Lerche | 2009-05-01 | 5 | -20/+69 | |
| | | | | | | | | | | | | classes as callable action methods | |||||
* | | | Move ContentType inline for now. | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -21/+6 | |
| | | | | | | | | | | | | Trying to avoid premature proliferation of modules. | |||||
* | | | Support implicit and explicit content types | Yehuda Katz + Carl Lerche | 2009-05-01 | 6 | -2/+139 | |
| | | | ||||||
* | | | Support implicit render and blank render | Yehuda Katz + Carl Lerche | 2009-05-01 | 6 | -27/+69 | |
| | | | ||||||
* | | | Ported over render :template tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 6 | -8/+39 | |
| | | | ||||||
* | | | Finished implementing render :text in Base2 | Yehuda Katz + Carl Lerche | 2009-05-01 | 6 | -8/+54 | |
| | | | ||||||
* | | | Renamed the new_base tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -94/+98 | |
| | | | ||||||
* | | | Renamed ActionController::AbstractBase to ActionController::Http | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -18/+18 | |
| | | | ||||||
* | | | Removed a stray method_missing in the new callbacks system | Yehuda Katz + Carl Lerche | 2009-05-01 | 1 | -9/+0 | |
| | | |