aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-1720-619/+330
|\
| * Move Flash into middlewareJoshua Peek2010-01-153-177/+6
| * Do not send the whole controller in notifications, cherry pick required pieces.José Valim2010-01-154-20/+45
| * Small tweaks in ActionController subscriber messages format.José Valim2010-01-151-2/+2
| * Move Dispatcher setup to Railties and add instrumentation hook.José Valim2010-01-154-57/+36
| * 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-142-4/+7
| * Test fragment/page cache and send data/file notifications.José Valim2010-01-131-5/+5
| * Add subscriber for ActionPack and move all logging inside it.José Valim2010-01-139-133/+149
| * Improve ActionPack logger output.José Valim2010-01-111-5/+8
| * Cleanup junk metal and revise APIJoshua Peek2010-01-101-3/+25
| * Use safe_concat instead of trying to html_safe! what might be a frozen stringDavid Heinemeier Hansson2010-01-101-2/+2
| * Raise an error if respond_with is invoked and no format is declared.José Valim2010-01-101-3/+6
| * Fixed that fragment caching should return a cache hit as html_safe (or it wou...David Heinemeier Hansson2010-01-071-1/+1
| * Remove duplicated url_for code and move methods shared between ActionMailer a...José Valim2010-01-074-210/+59
| * Remove CGI.escape in function of Rack::Mount.escapeJosé Valim2010-01-061-3/+3
| * Controller tests should always require view tests since they add behavior con...Jeremy Kemper2010-01-041-0/+1
| * Default middleware stack needs to be available at configuration timeJoshua Peek2010-01-041-20/+0
| * Autoload AS test caseJoshua Peek2010-01-041-1/+0
| * Autoload AC and AV test case classesJoshua Peek2010-01-041-1/+0
| * MergeDavid Heinemeier Hansson2010-01-034-13/+20
| |\
| | * Use underscore in notification namespaces.José Valim2010-01-044-6/+6
| | * Use namespaces in notifications.José Valim2010-01-034-13/+20
| * | Added that ActionController::Base now does helper :all instead of relying on ...David Heinemeier Hansson2010-01-031-0/+2
| |/
* | 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