aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-06-0140-404/+512
|\
| * Depend on Hash#slice and Object#tryJeremy Kemper2009-05-301-0/+3
| * html-scanner uses Set and class_inheritable_accessorJeremy Kemper2009-05-301-0/+3
| * AS::Concern redefines "include" to lazy include modules as dependenciesJoshua Peek2009-05-2918-26/+24
| * AS::Concern includes InstanceMethods module if it existsJoshua Peek2009-05-291-6/+1
| * Break up DependencyModule's dual function of providing a "depend_on" DSL and ...Joshua Peek2009-05-2826-45/+41
| * Revert "Revert "Whitespace!""Joshua Peek2009-05-2823-264/+270
| * The FlashHash and friends causes a lot of needless session storing, when we k...Johan Sörensen2009-05-281-33/+37
| * Memoize cookies so that updates to cookies are available in the current reque...Olly Legg2009-05-281-1/+1
| * Fix failing ActionCacheFilter tests due to around filter changes.Yehuda Katz + Carl Lerche2009-05-271-1/+1
| * Added hook point in new base #send_action which does the actual action method...Yehuda Katz + Carl Lerche2009-05-272-2/+4
| * Add the ability to prepend filters to new callbacksCarl Lerche2009-05-271-0/+9
| * Add % to RESERVED_PCHAR [#2574 state:resolved]Eduard Bondarenko2009-05-271-1/+1
| * ActionController::Flash::FlashHash.use now returns either the value correspon...Niels Ganser2009-05-271-6/+5
| * Reduce the cost of using ActionController::Http significantly by:Yehuda Katz2009-05-2711-28/+88
| * Get all template tests passing on new baseCarl Lerche2009-05-261-1/+1
| * Got all the dispatch tests running on new baseCarl Lerche2009-05-261-0/+3
| * Get controller/test_test.rb to pass on new baseCarl Lerche2009-05-261-1/+2
| * Add html-scanner to the new base set of autoloadsCarl Lerche2009-05-261-0/+2
| * Get controller/view_paths_test.rb to pass on new baseCarl Lerche2009-05-262-0/+17
| * In new base Rails2Compatibility, move @template assignment to right before th...Carl Lerche2009-05-261-6/+6
| * Make Filter#filter work with around filtersPratik Naik2009-05-253-12/+22
* | Merge commit 'mainstream/master'Pratik Naik2009-05-2439-449/+924
|\|
| * Make a couple more tests pass. Yehuda Katz2009-05-231-0/+11
| * Slightly modify things to get content type matching working without breaking ...Yehuda Katz2009-05-232-11/+11
| * Remove unnecessary asset_host initializationPratik Naik2009-05-232-2/+0
| * Add asset_host to Rails2CompatibilityPratik Naik2009-05-231-0/+6
| * Created an ActionController::Renderers::All that includes all the default ren...Yehuda Katz + Carl Lerche2009-05-222-4/+12
| * Got controller/render_js_test.rb to pass on new baseYehuda Katz + Carl Lerche2009-05-222-0/+11
| * Port cookies to new baseJeremy Kemper2009-05-222-1/+3
| * Add Translation to the new basePratik Naik2009-05-232-0/+2
| * Get controller/render_other_test.rb to pass on new base and fixed a bug in ne...Yehuda Katz + Carl Lerche2009-05-221-1/+1
| * Make logging_test pass with the new basePratik Naik2009-05-231-1/+1
| * Use super wherever possible in ActionController::Helpers#helperPratik Naik2009-05-231-5/+2
| * Get controller/layout_test.rb running on new base except for ActionController...Yehuda Katz + Carl Lerche2009-05-222-15/+12
| * Cleaned up the #render_to_body chain by extracting determining the templates ...Yehuda Katz + Carl Lerche2009-05-223-22/+30
| * Add all the existing helpers related features to the new basePratik Naik2009-05-235-19/+168
| * Move FilterParameterLogging to a stand alone module and make it work on new basePratik Naik2009-05-224-57/+100
| * Make assertion tests pass with the new basePratik Naik2009-05-221-0/+1
| * Ruby 1.9 compat: don't rely on lexical scoping since the included block is ca...Jeremy Kemper2009-05-211-2/+2
| * Move Safari response-padding fix to Rails2Compatibility. Should be a Rack con...Jeremy Kemper2009-05-214-21/+10
| * Dead localJeremy Kemper2009-05-211-1/+0
| * Implemented layout conditions in new baseYehuda Katz + Carl Lerche2009-05-211-3/+22
| * Added the :rjs render optionYehuda Katz + Carl Lerche2009-05-212-6/+19
| * Renamed #implicit_render to #default_render in new base to support the defaul...Yehuda Katz + Carl Lerche2009-05-211-3/+3
| * Add HTTP Authentication to the new basePratik Naik2009-05-224-2/+11
| * Add missing dependency in StreamingPratik Naik2009-05-221-0/+7
| * Update render options to remove performance implications of many render optio...Yehuda Katz + Carl Lerche2009-05-211-7/+25
| * Added the :xml render optionYehuda Katz + Carl Lerche2009-05-213-8/+27
| * Added the ability to register methods to handle specific render option keys a...Yehuda Katz + Carl Lerche2009-05-213-0/+43