aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-0435-745/+697
|\
| * Expose a _render_partial hook as thhe _render_template one and make use of it.José Valim2009-12-311-6/+6
| * ActionController::Logger should include AbstractController::Logger and sort a...José Valim2009-12-312-1/+4
| * controller_path is required by ActionView, so move it up to AbstractControlle...José Valim2009-12-313-187/+1
| * Some railties cleanup:Carl Lerche2009-12-311-1/+1
| * Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rbCarl Lerche2009-12-311-0/+1
| * Add a /rails.rb for each framework for consistencyCarl Lerche2009-12-311-0/+2
| * Revert "Add config.action_controller.include behavior to plugins."Jeremy Kemper2009-12-301-2/+1
| * Use extlib_inheritable_accessor in request_forgery_protection.rb.Carl Lerche2009-12-291-1/+1
| * Silence some trivial warnings: shadowed local vars, indentation mismatchesJeremy Kemper2009-12-283-182/+181
| * Remove ActiveRecord runtime logging from ActionPack and place in ActiveRecord...José Valim2009-12-273-30/+15
| * Remove ActionView inline logging to ActiveSupport::Notifications and create A...José Valim2009-12-268-111/+107
| * Finish moving config.frameworks-dependent code to the framework pluginCarlhuda2009-12-232-10/+75
| * Moving out some framework specific initializers into the framework libraries.Carlhuda2009-12-231-0/+27
| * Flip deferrable autoload conventionJoshua Peek2009-12-222-17/+21
| * All AD modules are "deferrable"Joshua Peek2009-12-221-0/+3
| * Use Rack::Runtime middleware so the reported time includes the entire middlew...Joshua Peek2009-12-221-1/+0
| * AD::StatusCodes support is now part of rackJoshua Peek2009-12-223-6/+6
| * Make ActionMailer::Base inherit from AbstractController::BaseJosé Valim2009-12-222-0/+35
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-211-1/+5
| |\
| | * reset_session needs to be a real method so flash can override itJoshua Peek2009-12-211-1/+5
| * | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-2117-105/+89
| |\|
| | * AC::Head now doesn't have an unfulfilled Rendering dependency, and instead wo...Yehuda Katz2009-12-204-12/+14
| | * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-2011-82/+65
| | |\
| | | * Rename RackConvenience => RackDelegationJoshua Peek2009-12-207-9/+9
| | | * Merge Session stuff into RackConvenienceJoshua Peek2009-12-206-73/+56
| | * | Rename RenderOptions to RenderersDavid Heinemeier Hansson2009-12-202-5/+4
| | |/
| | * Renamed Redirector to Redirecting (its a module, not a class)David Heinemeier Hansson2009-12-203-3/+3
| | * Rename the RenderingController module to just plain RenderingDavid Heinemeier Hansson2009-12-205-6/+6
| * | Added cookies.permanent, cookies.signed, and cookies.permanent.signed accesso...David Heinemeier Hansson2009-12-201-38/+130
| |/
| * Added alert/notice from 2-3-stable and refactored redirect_to into just livin...David Heinemeier Hansson2009-12-173-71/+122
| * Move route reloading into railtiesJoshua Peek2009-12-141-5/+0
| * Fix warning in AC flashJoshua Peek2009-12-141-0/+1
| * Allow autoloads to opt out of eager loadingJoshua Peek2009-12-122-3/+0
| * TestProcess belongs in ADJoshua Peek2009-12-122-113/+1
| * Remove fancy method not allowed resource exceptions since they areJoshua Peek2009-12-111-10/+1
| * Reduce usage of interpret_status. It should also return a integerJoshua Peek2009-12-101-4/+12
| * Merge branch 'master' of github.com:rails/railsYehuda Katz2009-12-101-56/+45
| |\
| | * Simpler RenderOption API -- removes the need for registering the types and ex...Carlhuda2009-12-091-56/+45
| * | Responder redirects to resource if destroy fails.José Valim2009-12-071-2/+7
| * | Make controller.flash public to be used in responders.José Valim2009-12-071-12/+12
| |/
| * Reorganize autoloads:Carlhuda2009-12-028-6/+14
| * cache_store and page_cache_directory are already defined in cachingJoshua Peek2009-12-011-4/+1
| * Allow ActionController::Responder to have a common entry point for all formats.José Valim2009-12-011-3/+8
| * Extract form_authenticity_param instance method so it's overridable in subcla...Jeremy Kemper2009-11-171-0/+5
* | Fix some more typos in ActionController::ResponderDaniel Schierbeck2009-12-211-7/+7
* | Fix some typos in the docs for ActionController::ResponderDaniel Schierbeck2009-12-211-10/+10
* | Merge remote branch 'mainstream/master'Pratik Naik2009-11-1745-3517/+420
|\|
| * Split mime responder into smaller chunks and allow action to be configured.José Valim2009-11-131-17/+27
| * Rdoc for changes introduced in e2ed1a1ca, 36058f450.David Vrensk2009-11-121-0/+1