aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Do not require passing :app to mounted helpers, it's actually useless and ↵Piotr Sarnacki2010-09-081-1/+1
| | | | | | | | not DRY
* | Adding linkage to redirect_to from Base and adding status code option referenceMikel Lindsaar2010-09-092-2/+6
|/
* Cleanup deprecation warnings in Action ControllerCarlos Antonio da Silva2010-09-064-64/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Forgot to move that line to railtie on rebasePiotr Sarnacki2010-09-031-1/+1
|
* Include all helpers from non-namespaced enginesPiotr Sarnacki2010-09-031-9/+3
|
* Set only helpers_path on inherited hook in action_controller/railtie.rb and ↵Piotr Sarnacki2010-09-033-9/+11
| | | | use helper(:all) just after that
* Moved ActionMailer and ActionController railties options to inherited hookPiotr Sarnacki2010-09-033-16/+32
| | | | | | | | | | | This change is needed, because we must take namespace into account and if controller's/mailer's class is namespaced, engine's paths should be set instead of application's ones. The nice side effect of this is removing unneeded logic in ActionController::Base.inherited - now the helpers_path should be set correctly even for engine's controllers, so helper(:all) will always include correct helpers.
* Refactor ActionMailer to not use hide_actionsPiotr Sarnacki2010-09-031-14/+1
|
* Move ActionController::Railties::RoutesHelpers and ↵Piotr Sarnacki2010-09-032-19/+2
| | | | ActionMailer::Railties::RoutesHelper to AbstractController::Railties::RoutesHelpers
* Fix generating urls with mounted helpers in view contextPiotr Sarnacki2010-09-031-1/+1
| | | | | | | | | | There were actually 2 problems with this one: * script_name was added to options as a string and then it was used in RouteSet#url_for with usage of <<, which was changing the original script_name * the second issue was with _with_routes method. It was called in RoutesProxy to modify _routes in view_context, but url_helpers in views is just delegating it to controller, so another _with_routes call is needed there
* Include application's helpers and router helpers by default, but include ↵Piotr Sarnacki2010-09-034-4/+30
| | | | engine's ones for controllers inside isolated namespace
* This is not neededPiotr Sarnacki2010-09-031-26/+0
|
* Add mounted_helpers to routesPiotr Sarnacki2010-09-032-1/+28
| | | | | | | | | | | | | | | | mounted_helpers are a bit similar to url_helpers. They're automatically included in controllers for Rails.application and each of mounted Engines. Mounted helper allows to call url_for and named helpers for given application. Given Blog::Engine mounted as blog_engine, there are 2 helpers defined: app and blog_engine. You can call routes for app and engine using those helpers: app.root_url app.url_for(:controller => "foo") blog_engine.posts_path blog_engine.url_for(@post)
* Ensure that env is always available in controllersPiotr Sarnacki2010-09-032-2/+6
|
* Added some more tests for url generation between Engine and ApplicationPiotr Sarnacki2010-09-031-4/+4
|
* Get rid of :skip_prefix options in routesPiotr Sarnacki2010-09-031-8/+4
|
* New way of generating urls for Application from Engine.Piotr Sarnacki2010-09-031-2/+11
| | | | | | | | | It's based specifying application's script_name with: Rails.application.default_url_options = {:script_name => "/foo"} default_url_options method is delegated to routes. If router used to generate url differs from the router passed via env it always overwrites :script_name with this value.