aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Annotated metaprogramming code across ActiveSupportMichael S. Klishin2008-12-2820-246/+449
* Merge commit 'rails/master'Yehuda Katz2008-12-2612-31/+124
|\
| * Merge commit 'fred/pullable'Pratik Naik2008-12-2611-27/+101
| |\
| | * Preload uses exclusive scope [#643 state:resolved]Frederick Cheung2008-12-265-16/+53
| | * Association preloading no longer stops if it hits a nil object [#1630 state:r...Pivotal Labs2008-12-262-2/+10
| | * MaKe Hash#slice! return removed values, akin to Array [#971 state:resolved]trans2008-12-262-4/+25
| | * Fix assert_select_rjs not checking id for inserts [#540 state:resolved]Frederick Cheung2008-12-262-0/+9
| | * Fix randomly failing cookie store testsFrederick Cheung2008-12-261-5/+4
| * | Remove method missing use in respond_toYehuda Katz2008-12-261-4/+23
* | | Merge commit 'rails/master'Yehuda Katz2008-12-266-94/+402
|\| |
| * | Merge docrailsPratik Naik2008-12-263-84/+334
| * | Don't recurse when ActionController#render is called without any argumentsPratik Naik2008-12-261-1/+1
| * | Make ActionController#render(symbol) behave same as ActionController#render(s...Pratik Naik2008-12-263-6/+16
| * | Make ActionController#render(string) work as a shortcut for render :action =>...Pratik Naik2008-12-253-4/+28
| * | Make ActionController#render(string) work as a shortcut for render :template ...Pratik Naik2008-12-253-4/+28
* | | Inline the only call site of Mime::Type#browser_generated?Michael S. Klishin2008-12-261-5/+1
* | | Initial work to merge several places with similar logicYehuda Katz2008-12-254-13/+23
|/ /
* | Make ActionController#render(string) work as a shortcut for render :file => s...Pratik Naik2008-12-253-9/+36
* | Move ActionController::Base#render arguments validation to a separate methodPratik Naik2008-12-251-8/+14
* | Make render_test.rb run in isolationPratik Naik2008-12-251-0/+2
* | Undry ActionController::TestCase#<HTTP_METHODS> for better documentationPratik Naik2008-12-252-14/+26
|/
* Move request parsing related code to ActionController::RequestParserPratik Naik2008-12-257-460/+512
* ActionController::VerbPiggybacking middlewareJoshua Peek2008-12-237-38/+49
* Remove duplicate attr_reader :envPratik Naik2008-12-231-4/+2
* Unify ActionController::AbstractRequest and ActionController::RequestPratik Naik2008-12-232-110/+81
* Use Rack::MockRequest for TestRequestPratik Naik2008-12-233-20/+9
* Rename RackRequest to RequestPratik Naik2008-12-236-11/+11
* Remove rack_process.rbPratik Naik2008-12-233-74/+73
* Remove deprecated relative_url_rootPratik Naik2008-12-231-7/+0
* Defining a new method is atomic, no mutex needed.Joshua Peek2008-12-221-8/+2
* Move default middleware stack to middlewares.rbJoshua Peek2008-12-222-17/+21
* ActiveRecord::QueryCache middlewareJoshua Peek2008-12-225-34/+28
* Ensure of Model#create support custom updated_at and updated_on attributes [#...Luis Hurtado2008-12-222-2/+12
* Use I18n for date/time select helpers prompt text [#561 state:resolved]Sam Oliver2008-12-223-6/+20
* Add :allow_nil option to delegate [#1127 state:resolved]Sergio Gil2008-12-213-1/+56
* Ensure Model#last doesn't affects order for another finders inside the same s...Daniel Luz2008-12-212-3/+26
* Added prompt options to date helpers [#561 state:resolved]Sam Oliver2008-12-213-0/+402
* Ensure the template format is always passed to the template finder. Now we ca...Joshua Peek2008-12-219-108/+102
* Merge commit 'fred/more_pullable'Pratik Naik2008-12-213-4/+38
|\
| * Allow use of symbols for :type option of ActionController::Streaming#send_fil...=?utf-8?q?Adam=20Cig=C3=A1nek?=2008-12-212-3/+37
| * Fix script/dbconsole not handling numeric password [#1395 state:resolved]pfagiani2008-12-211-1/+1
* | Correct description of tmp:create task [#1607 state:resolved] [Roderick van D...Pratik Naik2008-12-211-2/+2
* | Fix configure_dependency_for_has_many not quoting conditions properly [#1461 ...Frederick Cheung2008-12-213-3/+17
* | Use explicit order to stop test failing randomlyFrederick Cheung2008-12-211-2/+2
* | Fix failing cookie store testFrederick Cheung2008-12-211-3/+3
* | Remove observe_field :on option as prototype no longer supports it [#1088 sta...Frederick Cheung2008-12-211-11/+0
* | Remove dead commented out code [#1467 state:resolved]Yaroslav Markin2008-12-211-1/+0
|/
* Switch to Rack::Response#set_cookie instead of using CGI::Cookie to build coo...Joshua Peek2008-12-206-107/+66
* Fix Mime::Type#=~ not using Regexp.quoteFrederick Cheung2008-12-212-1/+2
* Fix has many through not quoting table names [#1163 state:resolved]Karthik Krishnan2008-12-203-4/+8