aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Add config.action_controller.include behavior to plugins."Jeremy Kemper2009-12-301-2/+1
* Partially revert "ActionDispatch should require as little of ActiveSupport as...Jeremy Kemper2009-12-301-0/+2
* ActionDispatch should require as little of ActiveSupport as possibleCarl Lerche2009-12-301-3/+1
* Use extlib_inheritable_accessor in request_forgery_protection.rb.Carl Lerche2009-12-291-1/+1
* Make sure evalled method knows where it came fromYehuda Katz2009-12-291-2/+2
* Complain if there's no such middlewareJeremy Kemper2009-12-281-2/+3
* Require active_support/dependencies/autoload in action_dispatchCarl Lerche2009-12-281-0/+1
* Silence some trivial warnings: shadowed local vars, indentation mismatchesJeremy Kemper2009-12-289-202/+197
* Ruby 1.9: string is not enumerable, so #exclude? is not availableJeremy Kemper2009-12-271-5/+3
* TypoJeremy Kemper2009-12-271-1/+1
* Require the enumberable extension from active support because we use #exclude?David Heinemeier Hansson2009-12-271-0/+2
* Merge remote branch 'jose/perf'Yehuda Katz2009-12-2711-188/+160
|\
| * 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-2610-139/+108
| * More <%= render(@posts) %> optimization.José Valim2009-12-261-24/+20
| * Optimize <%= render(@posts) %>.José Valim2009-12-261-4/+14
| * Break instrumentation into several end-points so rendering of partials can be...José Valim2009-12-263-30/+42
| * Wrap layout rendering in one method: _render_layout (this should make partial...José Valim2009-12-262-7/+7
* | Added shorthand for match 'products/overview' that expands to match 'products...David Heinemeier Hansson2009-12-271-1/+15
* | AD::Cascade that supports X-CascadeJoshua Peek2009-12-262-0/+30
* | rack-mount 0.4Joshua Peek2009-12-262-20/+20
|/
* The controller key shouldnt be part of the mapping if its not usedDavid Heinemeier Hansson2009-12-251-2/+2
* Instead of marking raw text in templates as safe, and then putting them throu...Yehuda Katz2009-12-241-1/+2
* Dead codeYehuda Katz2009-12-241-15/+0
* Translated strings in the view are assumed html_safe (Closes #3401)David Heinemeier Hansson2009-12-241-1/+1
* Stray carrier returnDavid Heinemeier Hansson2009-12-241-1/+0
* MergeDavid Heinemeier Hansson2009-12-244-12/+104
|\
| * Allow named_routes to be used with root, and with new DSL short-form.Sam Ruby2009-12-231-8/+7
| * Merge remote branch 'origin/master'Carlhuda2009-12-232-3/+5
| |\
| | * Routing: fix that route shorthand shouldn't ignore other options. Raise if :a...Jeremy Kemper2009-12-231-2/+4
| | * Shift more responsibility from application class to its singleton instance. T...Jeremy Kemper2009-12-231-1/+1
| * | Remove the ActionView::Base autoload because it creates crazy circular autolo...Carlhuda2009-12-231-1/+1
| * | 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
| |/
* / Extract Mapping class from monster match methodDavid Heinemeier Hansson2009-12-241-90/+137
|/
* MergeDavid Heinemeier Hansson2009-12-2227-230/+218
|\
| * Flip deferrable autoload conventionJoshua Peek2009-12-227-139/+142
| * All AD modules are "deferrable"Joshua Peek2009-12-2210-23/+35
| * Use Rack::Runtime middleware so the reported time includes the entire middlew...Joshua Peek2009-12-221-1/+0
| * Referer and user agent are in Rack::RequestJoshua Peek2009-12-221-1/+1
| * AD::StatusCodes support is now part of rackJoshua Peek2009-12-228-44/+10
| * Make ActionMailer::Base inherit from AbstractController::BaseJosé Valim2009-12-225-32/+40
* | Dont encourage __FILE__ bullshitDavid Heinemeier Hansson2009-12-221-2/+2
|/
* Dont introspect inline templates for the logger and cleanup a few styling issuesDavid Heinemeier Hansson2009-12-212-18/+13
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-212-3/+7
|\
| * Less annoying RoutingError messageJoshua Peek2009-12-211-2/+2
| * 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-2131-173/+160
|\|
| * Its now possible to use match 'stuff' => 'what#stuff' instead of using the :t...David Heinemeier Hansson2009-12-201-3/+7
| * We don't need AD parse_configJoshua Peek2009-12-202-21/+0