aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-04137-2493/+2966
|\
| * fixed missing or incorrect session data error messageStefan Penner2010-01-021-1/+1
| * Silence warningsMikel Lindsaar2010-01-021-0/+1
| * Do not enforce human_attribute_name as required API.José Valim2010-01-021-3/+6
| * I18n label helper [#745 status:resolved]Carsten Gehling2010-01-023-3/+77
| * Make rendering in ActionView happen through _render_template, as the renderin...José Valim2009-12-311-30/+14
| * 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 a...José Valim2009-12-313-8/+11
| * controller_path is required by ActionView, so move it up to AbstractControlle...José Valim2009-12-316-190/+173
| * Fix new year heisenbugJeremy Kemper2009-12-311-2/+2
| * Some railties cleanup:Carl Lerche2009-12-312-1/+1
| * 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
| * Partially revert "ActionDispatch should require as little of ActiveSupport as...Jeremy Kemper2009-12-301-0/+2
| * Merge commit 'josevalim/arlog'Jeremy Kemper2009-12-301-0/+39
| |\
| | * Kick AR logging back to life and move ControllerRuntime inside ActiveRecord::...José Valim2009-12-301-0/+39
| * | 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-2718-281/+232
| |\
| | * 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-2617-232/+180
| | * 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-272-7/+31
| * | 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 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-246-15/+116
| |\
| | * Allow named_routes to be used with root, and with new DSL short-form.Sam Ruby2009-12-232-8/+16
| | * Merge remote branch 'origin/master'Carlhuda2009-12-233-5/+9
| | |\
| | | * Routing: fix that route shorthand shouldn't ignore other options. Raise if :a...Jeremy Kemper2009-12-232-4/+8
| | | * 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