aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Only silence backtrace from plugin lib dirsJeremy Kemper2008-12-301-1/+2
* Test that exceptions raised in filters are properly rescuedJeremy Kemper2008-12-302-4/+22
* Fix formatted_* deprecation messageJeremy Kemper2008-12-301-2/+2
* Clean trailing / after rails root from backtracesJeremy Kemper2008-12-301-1/+1
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-3021-149/+165
|\
| * Merge commit 'fred/pullable'Pratik Naik2008-12-307-10/+52
| |\
| | * Fixed incorrect parsing of query parameters with mixed-depth nesting inside a...Mark Reginald James2008-12-282-5/+5
| | * Fix to_sentence being used with options removed by 273c77Frederick Cheung2008-12-271-1/+1
| | * Fix HasManyAssociation#create ignoring the :primary_key option [#1633 state:r...Roman Shterenzon2008-12-272-1/+10
| | * Fix :include of has_one with :primary_key optionFrederick Cheung2008-12-262-1/+17
| | * Fix :include of has_many associations with :primary_key optionFrederick Cheung2008-12-263-2/+19
| * | Fix named scope tests for sqlite3 [#1667 state:resolved]Mike Gunderloy2008-12-301-1/+1
| * | Add transaction check to SQLite2 adapter to fix test_sqlite_add_column_in_tra...Mike Gunderloy2008-12-301-0/+4
| * | Clean up view path cruft and split path implementations into Template::Path a...Joshua Peek2008-12-2912-138/+108
* | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-29125-1651/+4177
|\| |
| * | Fix failing gem dependency tests [#1659 state:resolved]Mike Gunderloy2008-12-291-12/+12
| * | Fix FCGI dispatching testsMike Gunderloy2008-12-291-42/+7
| * | Use rack namespace for routing argsJoshua Peek2008-12-281-2/+2
| * | Make router and controller classes better rack citizensJoshua Peek2008-12-288-87/+88
| * | HTTP Digest authentication [#1230 state:resolved]Joshua Peek2008-12-284-2/+432
| * | Allow custom rails generators to pass in their own binding to Create command ...Joshua Peek2008-12-281-1/+1
| * | Allow multiple conditions for callbacks [#1627 state:resolved]Joshua Peek2008-12-282-8/+43
| * | Fix 'i18n' require broken by 0.0.1 -> 0.1.1 commit [#1658 state:committed]Yaroslav Markin2008-12-281-1/+1
| * | Update i18n gem to version 0.1.1 (Rails' changes were backported) [#1635 stat...Yaroslav Markin2008-12-2816-71/+884
| * | 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
| * | 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