aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | 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
| | * | | | | | | Don't construct object deprecation proxy if unneededJeremy Kemper2008-12-221-4/+3
| * | | | | | | | Fixed the AssetTagHelper cache to use the computed asset host as part of the ...David Heinemeier Hansson2009-01-013-5/+27
* | | | | | | | | Sync 'rails/rails/master'Yehuda Katz2009-01-0511-29/+65
* | | | | | | | | Sync 'rails/rails/master'Yehuda Katz2009-01-043-1/+92
* | | | | | | | | Sync 'rails/rails/master'Yehuda Katz2009-01-0213-376/+287
* | | | | | | | | Only silence backtrace from plugin lib dirsJeremy Kemper2009-01-011-1/+2
* | | | | | | | | Test that exceptions raised in filters are properly rescuedJeremy Kemper2009-01-012-4/+22
* | | | | | | | | Fix formatted_* deprecation messageJeremy Kemper2009-01-011-2/+2
* | | | | | | | | Clean trailing / after rails root from backtracesJeremy Kemper2009-01-011-1/+1
* | | | | | | | | Fix named scope tests for sqlite3 [#1667 state:resolved]Mike Gunderloy2009-01-011-1/+1
* | | | | | | | | Add transaction check to SQLite2 adapter to fix test_sqlite_add_column_in_tra...Mike Gunderloy2009-01-011-0/+4
* | | | | | | | | Clean up view path cruft and split path implementations into Template::Path a...Joshua Peek2009-01-0112-138/+108
* | | | | | | | | Fix failing gem dependency tests [#1659 state:resolved]Mike Gunderloy2009-01-011-12/+12
* | | | | | | | | Fix FCGI dispatching testsMike Gunderloy2009-01-011-42/+7
* | | | | | | | | Fixed incorrect parsing of query parameters with mixed-depth nesting inside a...Mark Reginald James2009-01-012-5/+5
* | | | | | | | | Fix to_sentence being used with options removed by 273c77Frederick Cheung2009-01-011-1/+1
* | | | | | | | | Fix HasManyAssociation#create ignoring the :primary_key option [#1633 state:r...Roman Shterenzon2009-01-012-1/+10
* | | | | | | | | Fix :include of has_one with :primary_key optionFrederick Cheung2009-01-012-1/+17
* | | | | | | | | Fix :include of has_many associations with :primary_key optionFrederick Cheung2009-01-013-2/+19
* | | | | | | | | Don't construct object deprecation proxy if unneededJeremy Kemper2009-01-011-4/+3
* | | | | | | | | It was decided that Multibyte does not belong to as/mini.Michael S. Klishin2008-12-291-8/+2
* | | | | | | | | Sync with rails/rails/masterMichael S. Klishin2008-12-298-87/+88
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Use rack namespace for routing argsJoshua Peek2008-12-281-2/+2
| * | | | | | | | Make router and controller classes better rack citizensJoshua Peek2008-12-288-87/+88
* | | | | | | | | Pull up some other changes from rails/rails/masterMichael S. Klishin2008-12-297-11/+476
|\| | | | | | | |
| * | | | | | | | 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
| |/ / / / / / /
* | | | | | | | Sync i18n update from rails/rails/masterMichael S. Klishin2008-12-2816-71/+884
|\| | | | | | |
| * | | | | | | 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
* | | | | | | | 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