aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Make rendering in ActionView happen through _render_template, as the ↵José Valim2009-12-311-30/+14
| | | | rendering which comes from ActionController.
* Expose a _render_partial hook as thhe _render_template one and make use of it.José Valim2009-12-312-11/+15
|
* ActionController::Logger should include AbstractController::Logger and sort ↵José Valim2009-12-313-8/+11
| | | | autoloads for easier readability.
* controller_path is required by ActionView, so move it up to ↵José Valim2009-12-316-190/+173
| | | | AbstractController and refactor AbstractController::Layouts.
* Fix new year heisenbugJeremy Kemper2009-12-311-2/+2
|
* Some railties cleanup:Carl Lerche2009-12-312-1/+1
| | | | | | * Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin
* Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rbCarl Lerche2009-12-312-1/+3
|
* Add a /rails.rb for each framework for consistencyCarl Lerche2009-12-312-0/+3
|
* Fix controller runtime testJeremy Kemper2009-12-301-2/+2
|
* Revert "Add config.action_controller.include behavior to plugins."Jeremy Kemper2009-12-301-2/+1
| | | | | | | | This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e. Conflicts: railties/lib/rails/plugin.rb
* Partially revert "ActionDispatch should require as little of ActiveSupport ↵Jeremy Kemper2009-12-301-0/+2
| | | | | | as possible" Removes load path change from commit bb153f42e45160c5ef3593c393db5d3c6857fb70.
* Merge commit 'josevalim/arlog'Jeremy Kemper2009-12-301-0/+39
|\
| * Kick AR logging back to life and move ControllerRuntime inside ↵José Valim2009-12-301-0/+39
| | | | | | | | ActiveRecord::Rails.
* | 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
| | | For some reason the current class_inheritable_accessor does not play nice with included hooks. class_inheritable_accessor will be revised shortly.
* 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-2718-281/+232
|\
| * Remove ActiveRecord runtime logging from ActionPack and place in ↵José Valim2009-12-273-30/+15
| | | | | | | | ActiveRecord, adding it through config.action_controller.include hook.
| * Remove ActionView inline logging to ActiveSupport::Notifications and create ↵José Valim2009-12-2617-232/+180
| | | | | | | | ActionController::Base#log_event, so everything can be logged within one listener. Also expose log_process_action as a hook for different modules to include their own information during the action processing. This allow ActiveRecord to hook and any other ORM. Finally, this commit changes 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at the point it's logged, everying already happened.
| * 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 ↵José Valim2009-12-263-30/+42
| | | | | | | | be optimized.
| * Wrap layout rendering in one method: _render_layout (this should make ↵José Valim2009-12-262-7/+7
| | | | | | | | partial instrumentation easier).
* | Added shorthand for match 'products/overview' that expands to match ↵David Heinemeier Hansson2009-12-272-7/+31
| | | | | | | | 'products/overview', :to => 'products#overview', :as => 'products_overview'
* | AD::Cascade that supports X-CascadeJoshua Peek2009-12-262-0/+30
| |
* | rack-mount 0.4Joshua Peek2009-12-263-21/+21
| |
* | Expect Rack 1.1Joshua Peek2009-12-261-1/+1
|/
* The controller key shouldnt be part of the mapping if its not usedDavid Heinemeier Hansson2009-12-251-2/+2
|
* Fix testsDavid Heinemeier Hansson2009-12-251-2/+2
|
* Instead of marking raw text in templates as safe, and then putting them ↵Yehuda Katz2009-12-241-1/+2
| | | | through String#<< which checks if the String is safe, use safe_concat, which uses the original (internal) String#<< and leaves the safe flag as is. Results in a significant performance improvement.
* 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-246-15/+116
|\
| * Allow named_routes to be used with root, and with new DSL short-form.Sam Ruby2009-12-232-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | The real use case it to make all of the following act the same: root 'store#index', :as => 'store' match '/' => 'store#index', :as => 'store' match '/', :to => 'store#index', :as => 'store' The test case provided deviates from this in order to demonstrate all three forms in a single set of test routes. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Merge remote branch 'origin/master'Carlhuda2009-12-233-5/+9
| |\ | | | | | | | | | | | | Conflicts: railties/lib/rails/application.rb
| | * Routing: fix that route shorthand shouldn't ignore other options. Raise if ↵Jeremy Kemper2009-12-232-4/+8
| | | | | | | | | | | | :as option is given to root method since its name is always 'root'
| | * Shift more responsibility from application class to its singleton instance. ↵Jeremy Kemper2009-12-231-1/+1
| | | | | | | | | | | | Treat instantiation and boot as separate steps. Use app.config rather than app.configuration.
| * | Remove the ActionView::Base autoload because it creates crazy circular ↵Carlhuda2009-12-231-1/+1
| | | | | | | | | | | | autoload insanity
| * | 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
| |/
| * Fix bare string Rack response bodiesJeremy Kemper2009-12-231-2/+2
| |
* | Extract Mapping class from monster match methodDavid Heinemeier Hansson2009-12-242-91/+149
|/
* Require rack-mount 0.3.3Joshua Peek2009-12-221-1/+1
| | | | Fixes "Rack-mount boot time is slow as shit" [#3567 state:resolved]