aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-1710-329/+131
|\
| * Move Flash into middlewareJoshua Peek2010-01-152-176/+3
| * Do not send the whole controller in notifications, cherry pick required pieces.José Valim2010-01-152-9/+37
| * Move Dispatcher setup to Railties and add instrumentation hook.José Valim2010-01-151-1/+1
| * Respect resources_path_names and :path_names options in new dslJoshua Peek2010-01-131-3/+2
| * optimise_named_routes is unnecessaryJoshua Peek2010-01-131-5/+0
| * Tidy up ActiveRecord and Views runtime information on process action logger.José Valim2010-01-141-3/+5
| * Add subscriber for ActionPack and move all logging inside it.José Valim2010-01-135-113/+80
| * Improve ActionPack logger output.José Valim2010-01-111-5/+8
| * Raise an error if respond_with is invoked and no format is declared.José Valim2010-01-101-3/+6
| * Remove duplicated url_for code and move methods shared between ActionMailer a...José Valim2010-01-073-33/+10
| * Use underscore in notification namespaces.José Valim2010-01-041-3/+3
| * Use namespaces in notifications.José Valim2010-01-031-3/+4
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-0425-514/+547
|\|
| * 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-311-0/+4
| * controller_path is required by ActionView, so move it up to AbstractControlle...José Valim2009-12-311-171/+0
| * 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-282-181/+180
| * Remove ActiveRecord runtime logging from ActionPack and place in ActiveRecord...José Valim2009-12-272-30/+14
| * Remove ActionView inline logging to ActiveSupport::Notifications and create A...José Valim2009-12-264-98/+93
| * 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-221-4/+4
| * Make ActionMailer::Base inherit from AbstractController::BaseJosé Valim2009-12-221-0/+34
| * 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-2115-97/+77
| |\|
| | * AC::Head now doesn't have an unfulfilled Rendering dependency, and instead wo...Yehuda Katz2009-12-202-11/+8
| | * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-209-77/+61
| | |\
| | | * Rename RackConvenience => RackDelegationJoshua Peek2009-12-205-5/+5
| | | * Merge Session stuff into RackConvenienceJoshua Peek2009-12-205-72/+56
| | * | Rename RenderOptions to RenderersDavid Heinemeier Hansson2009-12-201-4/+3
| | |/
| | * Renamed Redirector to Redirecting (its a module, not a class)David Heinemeier Hansson2009-12-201-1/+1
| | * Rename the RenderingController module to just plain RenderingDavid Heinemeier Hansson2009-12-204-5/+5
| * | 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-172-5/+122
| * Fix warning in AC flashJoshua Peek2009-12-141-0/+1
| * Remove fancy method not allowed resource exceptions since they areJoshua Peek2009-12-111-10/+1
| * 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-023-2/+2
| * 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-1719-363/+216
|\|