aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-11-271-3/+7
|\
| * Add explicit statement that verify_authenticity_token can be turned off for ↵Ryan Bigg2010-11-271-3/+7
| | | | | | | | actions.
* | implicit self hereSantiago Pastorino2010-11-251-1/+1
| |
* | move the setting up of the mime collector into the collector on initJosh Kalderimis2010-11-251-3/+3
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | If a user wants json output then try best to render json output. In such ↵Neeraj Singh2010-11-241-1/+1
|/ | | | | | | | cases prefer kind_of(String) over respond_to?(to_str) [#5841 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* :subdomain, :domain and :tld_length options can now be used in url_for, ↵Josh Kalderimis2010-11-231-1/+3
| | | | | | allowing for easy manipulation of the host during link generation. Signed-off-by: José Valim <jose.valim@gmail.com>
* Remove unused constantSantiago Pastorino2010-11-221-2/+0
|
* There's no need for ternary op hereSantiago Pastorino2010-11-221-1/+1
|
* Remove unneeded metaprogramming and method generation in favor of direct ↵Santiago Pastorino2010-11-221-24/+10
| | | | definition
* Fix indentationSantiago Pastorino2010-11-201-24/+23
|
* Add config.action_controller.include_all_helpers, by default it is set to true.Piotr Sarnacki2010-11-181-1/+2
| | | | | | | In older rails versions there was a way to use only helpers from helper file corresponding to current controller and you could also include all helpers by saying 'helper :all' in controller. This config allows to return to older behavior by setting it to false.
* Move @assigns from the controller to the test itselfSantiago Pastorino2010-11-061-1/+0
|
* Fix problems trying to functional test AC::Metal controllersSantiago Pastorino2010-11-061-9/+1
| | | | [#5393 state:committed]
* Correctly handle the case of an API response that returns a hash by treating ↵Chris Eppstein2010-11-061-1/+1
| | | | a single hash argument as the resource instead of as options.
* 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-101-4/+2
|
* 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
| |
* | 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
|/
* 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-271-3/+3
| | | | 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-271-3/+3
|\ | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/url_for.rb
| * Initialize @_routes if not defined yet, avoiding more warnings.Emilio Tagua2010-09-271-0/+1
| |
| * Remove more warnings shadowing outer local variable.Emilio Tagua2010-09-271-3/+3
| |
* | Cache url_options on a per-request basis.thedarkone2010-09-271-9/+11
|/
* Remove deprecated stuff in ActionControllerCarlos Antonio da Silva2010-09-261-1/+1
| | | | | | 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.
* 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>
* Refactor decode_credentials to avoid inject and use map instead.Emilio Tagua2010-09-221-6/+5
| | | | 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.
* revises implementation and documentation of csrf_meta_tags, and aliases ↵Xavier Noria2010-09-111-2/+2
| | | | csrf_meta_tag to it for backwards compatibilty
* Adding linkage to redirect_to from Base and adding status code option referenceMikel Lindsaar2010-09-091-2/+4
|
* Cleanup deprecation warnings in Action ControllerCarlos Antonio da Silva2010-09-063-32/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Refactor ActionMailer to not use hide_actionsPiotr Sarnacki2010-09-031-14/+1
|
* 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-031-1/+5
| | | | engine's ones for controllers inside isolated namespace
* Ensure that env is always available in controllersPiotr Sarnacki2010-09-031-1/+1
|
* 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.
* Revert "Setup explicit requires for files with exceptions. Removed them from ↵José Valim2010-09-024-6/+0
| | | | | | | | autoloading." Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6.
* Setup explicit requires for files with exceptions. Removed them from ↵Łukasz Strzałkowski2010-09-024-0/+6
| | | | | | autoloading. Signed-off-by: José Valim <jose.valim@gmail.com>