aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* AC::Caching DRYupKrekoten' Marjan2010-10-181-5/+1
| | | | | | | Remove ActionController::Caching::Pages#caching_allowed because it duplicates ActionController::Caching#caching_allowed? Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Reset assert_template instance variables between requests [#5832 state:resolved]Andrew White2010-10-181-0/+7
|
* replace if ! with unlessNeeraj Singh2010-10-171-1/+1
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-141-1/+1
|\
| * Fix small typo in documentationKrekoten' Marjan2010-10-121-1/+1
| |
* | Return a valid empty JSON on successful PUT and DELETE requests. [#5199 ↵Szymon Nowak2010-10-121-0/+20
|/ | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Rendering doesn't need RackDelegationwycats2010-10-101-1/+0
|
* Fix a few bugs when trying to use Head standalonewycats2010-10-102-4/+7
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-061-4/+0
|\
| * `render :text => proc { ... }` is no longer supported.John Firebaugh2010-10-041-4/+0
| |
* | Provide a cleaner syntax for paths configuration that does not rely on ↵José Valim2010-10-062-6/+8
| | | | | | | | method_missing.
* | Solve some warnings and a failing test.José Valim2010-10-031-0/+1
| |
* | Rely on Rack::Session stores API for more compatibility across the Ruby world.José Valim2010-10-031-3/+5
| |
* | no need of nil checkNeeraj Singh2010-09-301-1/+1
| |
* | reduce function calls on ArrayAaron Patterson2010-09-291-3/+2
| |
* | removing more lolinjectAaron Patterson2010-09-291-8/+7
| |
* | removing lollerjectAaron Patterson2010-09-291-1/+1
|/
* Merge remote branch 'miloops/warnings'José Valim2010-09-291-3/+5
|\
| * Remove more warnings: no need to define attr_accessor if already exists. ↵Emilio Tagua2010-09-281-3/+5
| | | | | | | | Initialize ivar.
| * Move uri parser to AS as URI.parser method to reuse it in AP and ARes.Emilio Tagua2010-09-273-19/+2
| |
* | Move uri parser to AS as URI.parser method to reuse it in AP and ARes.Emilio Tagua2010-09-283-19/+2
| |
* | Fix tests on 1.9.2.José Valim2010-09-281-0/+1
| |
* | renderer calls object.to_json when rendering :json => object [#5655 ↵Diego Carrion2010-09-271-1/+1
|/ | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Remove more warnings shadowing outer local variable.Emilio Tagua2010-09-272-6/+6
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Remove warning "URI.unescape is obsolete" from actionpack.Emilio Tagua2010-09-274-9/+13
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Do not cache the script name outcome.José Valim2010-09-271-9/+11
|
* Merge remote branch 'miloops/warnings'José Valim2010-09-276-11/+25
|\ | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/url_for.rb
| * Initialize @_routes if not defined yet, avoiding more warnings.Emilio Tagua2010-09-271-0/+1
| |
| * Avoid uninitialized variable warning.Emilio Tagua2010-09-271-1/+1
| |
| * Initialize @_request and @_response.Emilio Tagua2010-09-271-1/+3
| |
| * Remove more warnings shadowing outer local variable.Emilio Tagua2010-09-272-6/+6
| |
| * Remove warning "URI.unescape is obsolete" from actionpack.Emilio Tagua2010-09-273-3/+15
| |
* | Call it compile_methods! and do the same on AM.José Valim2010-09-271-2/+2
| |
* | Cache url_options on a per-request basis.thedarkone2010-09-271-9/+11
| |
* | Compile ActionController::Base.config's methods to avoid method_missing ↵thedarkone2010-09-271-0/+10
|/ | | | overhead.
* Partial revert of #d650b71 'Remove deprecated stuff in ActionController'Carlos Antonio da Silva2010-09-263-0/+6
| | | | | This brings back the deprecated modules from ActionController, because they didn't have any deprecation warning.
* Remove deprecated stuff in ActionControllerCarlos Antonio da Silva2010-09-265-8/+2
| | | | | | This removes all deprecated classes in ActionController related to Routing, Abstract Request/Response and Integration/IntegrationTest. All tests and docs were changed to ActionDispatch instead of ActionController.
* Fix logging when cache key contains % sign [#5570 state:resolved]Krekoten' Marjan2010-09-251-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* There is no need to use instance_eval since the proc is created in the same ↵José Valim2010-09-241-1/+1
| | | | context it is eval'ed.
* Make redirect_to accept blocks [#5643 state:resolved]Nando Vieira2010-09-241-1/+5
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* resolves rdoc conflictXavier Noria2010-09-231-2/+2
|\
| * updated instructions on how to change the default session storeDiego Carrion2010-09-181-2/+2
| |
| * updated instructions to generate the migration for the ActiveRecord session ↵Diego Carrion2010-09-181-1/+1
| | | | | | | | store table
* | Refactor decode_credentials to avoid inject and use map instead.Emilio Tagua2010-09-221-6/+5
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Refactor methods in html node to avoid injects.Emilio Tagua2010-09-221-8/+4
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Fix header capitalization by explicitly upcasing first letter of every word, ↵Maxim Chernyak2010-09-181-1/+1
| | | | | | | | and avoiding capitalize. [#5636 state:resolved]
* | Small tweak the ConditionalGet documentationCarl Lerche2010-09-171-2/+2
|/ | | Time#utc does not need to be called when passing the object to :last_modified since it is called internally to Rails.
* added block arguments to ActionController::Metal#useCollin Miller2010-09-121-3/+3
| | | | | | | | | | | Useful for cases such as warden, where a block configuration is taken. class SomeController < ApplicationController use RailsWarden::Manager do |manager| manager.default_strategies :facebook_oauth manager.failure_app = SomeController.action(:authorize) end end
* revises implementation and documentation of csrf_meta_tags, and aliases ↵Xavier Noria2010-09-111-2/+2
| | | | csrf_meta_tag to it for backwards compatibilty
* Merge remote branch 'drogus/engines'wycats2010-09-111-1/+1
|\