aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Sync 'rails/rails/master'Yehuda Katz2009-01-067-9/+15
|\
| * Fix failing flash testJeremy Kemper2009-01-061-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-01-064-6/+11
| |\
| | * Bump Rack version to 0.9Joshua Peek2009-01-064-6/+11
| | |
| * | Consolidate test_help requiresJeremy Kemper2009-01-061-2/+1
| | |
| * | Explicitly require AS::TestCaseJeremy Kemper2009-01-061-0/+2
| |/
* | Sync 'rails/rails/master'Yehuda Katz2009-01-050-0/+0
|\|
| * Cache AssetTag timestampsJoshua Peek2009-01-042-5/+33
| |
| * TimeWithZone#- gives correct result with wrapped DateTime, and with DateTime ↵gbuesing2009-01-043-1/+12
| | | | | | | | argument
| * Memoize request accessors on the Rack env so other request objects have ↵Joshua Peek2009-01-046-23/+20
| | | | | | | | access to the same cache [#1668 state:resolved]
| * Move metal above method piggybacking middleware and add some test coverageJoshua Peek2009-01-033-1/+92
| |
| * Add failing test for file uploads with unrewindable inputJoshua Peek2009-01-022-10/+37
| |
| * Revert to the good old days when AssetTag didn't cause anyone problemsJoshua Peek2009-01-024-333/+131
| |
| * Fixed call_with_exception for Routing Errors [#1684 state:resolved]Laszlo Bacsi2009-01-022-2/+9
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fixed bug where calling app method from console would raise ArgumentError ↵ddemaree2009-01-022-3/+11
| | | | | | | | | | | | [#1629 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Added :silence option to BenchmarkHelper#benchmark and turned log_level into ↵David Heinemeier Hansson2009-01-013-28/+77
| | | | | | | | a hash parameter and deprecated the old use [DHH]
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2009-01-0138-313/+778
| |\
| | * 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 ↵Mark Reginald James2008-12-282-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an array [#1622 state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | | | * Fix to_sentence being used with options removed by 273c77Frederick Cheung2008-12-271-1/+1
| | | | |
| | | | * Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵Roman Shterenzon2008-12-272-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | | | * 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
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | | * | Add transaction check to SQLite2 adapter to fix ↵Mike Gunderloy2008-12-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | | * | Clean up view path cruft and split path implementations into Template::Path ↵Joshua Peek2008-12-2912-138/+108
| | | | | | | | | | | | | | | | | | | | and Template::EagerPath
| | * | | 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
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | | * | Fix FCGI dispatching testsMike Gunderloy2008-12-291-42/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * | | 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
| | | | | | | | | | | | | | | | | | | | cache key instead of just assuming the its a string [#1299 state:committed]
* | | | | 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
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | | | Add transaction check to SQLite2 adapter to fix ↵Mike Gunderloy2009-01-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | | | Clean up view path cruft and split path implementations into Template::Path ↵Joshua Peek2009-01-0112-138/+108
| | | | | | | | | | | | | | | | | | | | and Template::EagerPath
* | | | | Fix failing gem dependency tests [#1659 state:resolved]Mike Gunderloy2009-01-011-12/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | | | Fix FCGI dispatching testsMike Gunderloy2009-01-011-42/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | | | Fixed incorrect parsing of query parameters with mixed-depth nesting inside ↵Mark Reginald James2009-01-012-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an array [#1622 state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
* | | | | Fix to_sentence being used with options removed by 273c77Frederick Cheung2009-01-011-1/+1
| | | | |