aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Sync with rails/rails/master, merge two metaprogramming annotation effortsMichael S. Klishin2008-12-2834-285/+437
|\
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-12-2828-296/+373
| |\
| | * Inline code comments for class_eval/module_eval [#1657 state:resolved]Xavier Noria2008-12-2828-296/+373
| * | Introduce dynamic scopes for ActiveRecord: you can now use class methods like...Yaroslav Markin2008-12-285-1/+72
| |/
| * Ensure template runner tests don't depend on hash ordering [#1654 state:resol...Mike Gunderloy2008-12-282-2/+2
| * Request#env['SERVER_NAME'] does not contain port numberPratik Naik2008-12-283-8/+4
| * Use SimpleLogger for Rails::TemplateRunner outside of the Generator context [...Aaron Quint2008-12-281-0/+10
* | Use active_support/mini instead of active_support/minimalisticMichael S. Klishin2008-12-281-15/+0
* | Sync with wycats/rails/masterMichael S. Klishin2008-12-2816-179/+202
|\ \
| * | Annotated metaprogramming code across ActiveSupportMichael S. Klishin2008-12-2820-246/+449
| * | Merge commit 'rails/master'Yehuda Katz2008-12-2612-31/+124
| |\ \
| * \ \ Merge commit 'rails/master'Yehuda Katz2008-12-266-94/+402
| |\ \ \
| * | | | 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
* | | | | active_support/minimalistic.rb => active_support/mini.rbMichael S. Klishin2008-12-281-0/+0
* | | | | Introduce minimalistic package for ActiveSupport.Michael S. Klishin2008-12-282-1/+20
| |_|_|/ |/| | |
* | | | Adding test coverage and better logging to Rails::TemplateRunner [#1618 state...Aaron Quint2008-12-272-66/+243
* | | | Fix ActionPack build on Windows: we really should not test anything regarding...Yaroslav Markin2008-12-271-10/+12
* | | | Refactor ActiveRecord::Base#new_record? [#1647 state:committed]Yaroslav Markin2008-12-271-1/+1
* | | | ActiveRecord::Base#new_record? now returns false for existing records (was ni...Yaroslav Markin2008-12-273-2/+9
* | | | More optimizations on respond_to after a profile and benching:Yehuda Katz2008-12-271-6/+2
| |_|/ |/| |
* | | 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 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
| |/ |/|
* | 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