aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Sync 'rails/rails/master'Yehuda Katz2009-01-066-7/+14
|\
| * 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
| * | Explicitly require AS::TestCaseJeremy Kemper2009-01-061-0/+2
| |/
| * Cache AssetTag timestampsJoshua Peek2009-01-042-5/+33
| * Memoize request accessors on the Rack env so other request objects have acces...Joshua Peek2009-01-046-23/+20
| * Move metal above method piggybacking middleware and add some test coverageJoshua Peek2009-01-032-0/+91
| * 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
| * Fixed bug where calling app method from console would raise ArgumentError [#1...ddemaree2009-01-021-3/+2
| * Added :silence option to BenchmarkHelper#benchmark and turned log_level into ...David Heinemeier Hansson2009-01-013-28/+77
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2009-01-0123-238/+656
| |\
| | * Test that exceptions raised in filters are properly rescuedJeremy Kemper2008-12-302-4/+22
| | * Fix formatted_* deprecation messageJeremy Kemper2008-12-301-2/+2
| | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-3012-139/+109
| | |\
| | | * Merge commit 'fred/pullable'Pratik Naik2008-12-302-5/+5
| | | |\
| | | | * Fixed incorrect parsing of query parameters with mixed-depth nesting inside a...Mark Reginald James2008-12-282-5/+5
| | | * | Clean up view path cruft and split path implementations into Template::Path a...Joshua Peek2008-12-2910-134/+104
| | * | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-2953-1061/+2007
| | |\| |
| | * | | 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-058-28/+53
* | | | | Sync 'rails/rails/master'Yehuda Katz2009-01-042-0/+91
* | | | | Sync 'rails/rails/master'Yehuda Katz2009-01-0212-376/+278
* | | | | Test that exceptions raised in filters are properly rescuedJeremy Kemper2009-01-012-4/+22
* | | | | Fix formatted_* deprecation messageJeremy Kemper2009-01-011-2/+2
* | | | | Clean up view path cruft and split path implementations into Template::Path a...Joshua Peek2009-01-0110-134/+104
* | | | | Fixed incorrect parsing of query parameters with mixed-depth nesting inside a...Mark Reginald James2009-01-012-5/+5
* | | | | Don't construct object deprecation proxy if unneededJeremy Kemper2009-01-011-4/+3
* | | | | 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-294-2/+432
|\| | | |
| * | | | HTTP Digest authentication [#1230 state:resolved]Joshua Peek2008-12-284-2/+432
| |/ / /
* | | | Sync with rails/rails/master, merge two metaprogramming annotation effortsMichael S. Klishin2008-12-288-54/+59
|\| | |
| * | | Inline code comments for class_eval/module_eval [#1657 state:resolved]Xavier Noria2008-12-285-46/+55
| * | | Request#env['SERVER_NAME'] does not contain port numberPratik Naik2008-12-283-8/+4
| * | | Fix ActionPack build on Windows: we really should not test anything regarding...Yaroslav Markin2008-12-271-10/+12
| * | | More optimizations on respond_to after a profile and benching:Yehuda Katz2008-12-271-6/+2
| | |/ | |/|
* | | Annotated metaprogramming code across ActiveSupportMichael S. Klishin2008-12-282-16/+14
* | | Merge commit 'rails/master'Yehuda Katz2008-12-264-9/+36
|\| |
| * | Merge commit 'fred/pullable'Pratik Naik2008-12-263-5/+13
| |\ \
| | * | 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-263-10/+68
|\| | |
| * | | 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