aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove errant debug codeYehuda Katz2009-02-031-2/+0
| | |
| * | Add support for pendingYehuda Katz2009-02-022-9/+15
| | |
| * | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-02-021-1/+0
| |\ \
| | * | Remove dead cgi_ext requireJeremy Kemper2009-01-311-1/+0
| | | |
| * | | Some merge cleanupYehuda Katz2009-02-025-15/+16
| | | |
| * | | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-30114-1091/+1303
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| | * | Move dispatch related tests into test/dispatchJoshua Peek2009-01-2812-105/+111
| | | |
| | * | Move HTTP libs and middleware into ActionDispatch componentJoshua Peek2009-01-2743-426/+133
| | | |
| | * | Reorganize ActionController folder structureJoshua Peek2009-01-2765-558/+936
| | | |
| | * | Begin unifying the interface between ActionController and ActionViewYehuda Katz2009-01-2234-485/+611
| | | |
| * | | Sync 'rails/rails/master'Yehuda Katz2009-01-3064-907/+1446
| |\ \ \
| * \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-149-42/+35
| |\ \ \ \
| * \ \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-135-8/+128
| |\ \ \ \ \
| * \ \ \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-137-444/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-115-370/+338
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-096-212/+268
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove Content-Length header from :no_content responsesJeremy Kemper2009-01-092-4/+12
| | | | | | | | | |
| * | | | | | | | | Set assigns for integration tests alsoJeremy Kemper2009-01-091-2/+5
| | | | | | | | | |
| * | | | | | | | | Take care not to mix in public methodsJeremy Kemper2009-01-091-9/+10
| | | | | | | | | |
| * | | | | | | | | Use instance_eval instead of adding an accessor to the classJeremy Kemper2009-01-091-2/+1
| | | | | | | | | |
| * | | | | | | | | Include process methods in ActionController::TestCase only. No need to ↵Jeremy Kemper2009-01-0912-81/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alias_method_chain :process either.
| * | | | | | | | | Sync 'rails/rails/master'Yehuda Katz2009-01-066-7/+14
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 ↵Joshua Peek2009-01-0110-134/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Template::EagerPath
| * | | | | | | | | | 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>
| * | | | | | | | | | Don't construct object deprecation proxy if unneededJeremy Kemper2009-01-011-4/+3
| | | | | | | | | | |
| * | | | | | | | | | Sync with rails/rails/masterMichael S. Klishin2008-12-298-87/+88
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Pull up some other changes from rails/rails/masterMichael S. Klishin2008-12-294-2/+432
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Sync with rails/rails/master, merge two metaprogramming annotation effortsMichael S. Klishin2008-12-288-54/+59
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Annotated metaprogramming code across ActiveSupportMichael S. Klishin2008-12-282-16/+14
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge commit 'rails/master'Yehuda Katz2008-12-264-9/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'rails/master'Yehuda Katz2008-12-263-10/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Inline the only call site of Mime::Type#browser_generated?Michael S. Klishin2008-12-261-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael S. Klishin <michael@novemberain.com>
| * | | | | | | | | | | | | | | Initial work to merge several places with similar logicYehuda Katz2008-12-254-13/+23
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Examples should be preceded with four equal signs.Johan Andersson2009-04-141-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fixed confusing wording in ActionCachePathKyle2009-04-081-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix typos in date helper rdoc (via Mike Breen)Mike Gunderloy2009-04-081-3/+3
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix grammar error in caching docs (via pblka)Mike Gunderloy2009-04-081-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge commit 'mainstream/master'Pratik Naik2009-04-0410-285/+297
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Additional template render test for backup files [#2367 state:resolved]Cezary Baginski2009-04-024-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | | | | | | | | | | | | | adding session_options initialization and test [#2303 state:resolved]Ryan Angilly2009-03-242-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | | | | | | | | | | | | | Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved]thedarkone2009-03-242-30/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | | | | | | | | | | | | | Simplify handling of absolute path templates. [#2276 state:resolved]thedarkone2009-03-242-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | | | | | | | | | | | | | Updates tests to cause the tests for the Request class not to proxy through ↵David Dollar2009-03-241-230/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a fake TestRequest object [#2278 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | | | | | | | | | | | | | Reset request_parameters in TestRequest#recycle! to avoid multiple posts ↵Peter Marklund2009-03-242-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clobbering each other [#2271 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | | | | | | | | | | | | | | just kill brittle testJoshua Peek2009-03-241-21/+0
| | | | | | | | | | | | | | | |