aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'docrails/master'Xavier Noria2010-08-2811-108/+89
|\
| * Revert "call-seq directive makes rdoc cry and replaces method names with a ↵Xavier Noria2010-08-271-0/+15
| | | | | | | | | | | | | | | | curly brace; besides it doesn't add anything when you only list one call example since this is obviously documented already" Reason: Part of this commit touches vendorized stuff, the rest is fine, could you please repatch? This reverts commit 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a.
| * call-seq directive makes rdoc cry and replaces method names with a curly ↵Joost Baaij2010-08-271-15/+0
| | | | | | | | brace; besides it doesn't add anything when you only list one call example since this is obviously documented already
| * escape constant namesJoost Baaij2010-08-262-9/+9
| |
| * Reflect how CSRF protection now works and refer to the Security Guide for ↵Joost Baaij2010-08-261-36/+18
| | | | | | | | more information
| * cleanup of ActionController::Metal inline documentationJoost Baaij2010-08-265-51/+50
| |
| * Escape 'caching' when used in a sentence; remove unnessesary quotesJoost Baaij2010-08-263-12/+12
| |
* | Be sure to call helper :all just on direct children. (Tests by Jesse Storimer)José Valim2010-08-261-1/+1
|/
* Restored top-level documentation for ActionController::Base.Joost Baaij2010-08-251-0/+163
| | | | | | | | | This information was lost in commit bd6b61be88dfe6eb1ff1dcc5c17542d804a842c7. This might have been intentional, but this class does represent the starting point for all things related to actions, and as such should document it. I couldn't find any trace of this documentation, which seems like a waste. Updated parts here and there to conform to current best practices.
* Reset symbolized path parameters when a test request is recycled [#5437 ↵Andrew White2010-08-241-0/+1
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Use attribute readers as they are faster in general.José Valim2010-08-191-8/+2
|
* Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵Santiago Pastorino2010-08-148-69/+69
| | | | 's/[ \t]*$//' -i {} \;)
* API Docs: Use 'HTTP_AUTHORIZATION' and not :authorize as key in integration ↵Rohit Arondekar2010-07-301-1/+1
| | | | tests.
* doc: cleanup respond_to documentationWincent Colaiuta2010-07-261-9/+12
| | | | Signed-off-by: Wincent Colaiuta <win@wincent.com>
* Change returning with tapSantiago Pastorino2010-07-251-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Clean up AM and AC railties.José Valim2010-07-242-33/+14
|
* Also move asset_path to AbstractController.José Valim2010-07-241-1/+0
|
* Move config_accessor :asset_host from ActionController::Base to ↵Jeroen van Dijk and Josh Kalderimis2010-07-241-1/+1
| | | | | | | | AbstractController which fixes issues with asset_host in ActionMailer Including: - Moved mailer objects in separate directory - Added two tests for asset_host configuration option
* No need to delegate. Simply include the whole RecordIdentifier module.José Valim2010-07-211-0/+2
|
* Moved a few methods from RecordIdentifier to ActiveModel::NamingPiotr Sarnacki2010-07-211-30/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Moved PolymorphicRoutes to ActionDispatch::RoutingPiotr Sarnacki2010-07-202-184/+0
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add a test for elapsed and require missing benchmark file.José Valim2010-07-201-0/+1
|
* Add missing require to metal/streaming.rbJosé Valim2010-07-201-0/+2
|
* Remove unused orig_handler and unneeded parenthesesSantiago Pastorino2010-07-201-3/+3
|
* There is absolutely no need to use __send__ here.José Valim2010-07-191-3/+3
|
* No need to create a new module in the previous commit.José Valim2010-07-193-17/+10
|
* Exceptions from views should be rescued based on the original exception. If ↵Neeraj Singh2010-07-192-2/+18
| | | | | | | | a handler for original exception is missing then apply ActiveView::TemplateError [#2034 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fixed many references to the old config/environment.rb and Rails::InitializerBenjamin Quorning2010-07-131-1/+1
|
* Fix setting helpers_path to a string or pathnameJeremy Kemper2010-07-071-2/+3
|
* Define a convention for descendants and subclasses.José Valim2010-07-052-7/+0
| | | | | | The former should be symmetric with ancestors and include all children. However, it should not include self since ancestors + descendants should not have duplicated. The latter is symmetric to superclass in the sense it only includes direct children. By adopting a convention, we expect to have less conflict with other frameworks, as Datamapper. For this moment, to ensure ActiveModel::Validations can be used with Datamapper, we should always call ActiveSupport::DescendantsTracker.descendants(self) internally instead of self.descendants avoiding conflicts.
* Fixes for "router" and "routes" terminologyWincent Colaiuta2010-07-033-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f7ba614c2db improved the internal consistency of the different means of accessing routes, but it introduced some problems at the level of code comments and user-visible strings. This commit applies fixes on three levels: Firstly, we remove or replace grammatically invalid constructs such as "a routes" or "a particular routes". Secondly, we make sure that we always use "the router DSL" or "the router syntax", because this has always been the official terminology. Finally, we make sure that we only use "routes" when referring to the application-specific set of routes that are defined in the "config/routes.rb" file, we use "router" when referring on a more abstract level to "the code in Rails used to handle routing", and we use "routing" when we need an adjective to apply to nouns such as "url_helpers. Again this is consistent with historical practice and other places in the documentation. Note that this is not a sweep over the entire codebase to ensure consistent usage of language; it is just a revision of the changes introduced in commit f7ba614c2db. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: José Valim <jose.valim@gmail.com>
* Unify routes naming by renaming router to routesPiotr Sarnacki2010-07-023-6/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Use caller for helpers_dir deprecation warningsJeremy Kemper2010-06-281-2/+2
|
* Strip_tags never ending attribute should not raise a TypeError [#4870 ↵Bruno Michel2010-06-282-0/+2
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Small changes to responder:José Valim2010-06-261-5/+13
| | | | | | * resources is always an array; * Lazy retrieve request and formats; * Alias api_location and navigation_location to resource_location, making easier to change its behavior without affecting each other and without a need to reimplement any of the behavior methods.
* Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing ↵José Valim2010-06-244-59/+58
| | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved]
* Sessions should not be created until written to and session data should be ↵Michael Lovitt2010-06-231-0/+2
| | | | | | | | destroyed on reset. [#4938] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix controller_name for non default controller paths [#4901 state:resolved]knapo2010-06-231-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add support for specifying locals in view tests with assert template [#4927 ↵David Chelimsky2010-06-221-3/+13
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-06-204-10/+22
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * Make polymorphic_url and scaffolding work with uncountable resources [#3930 ↵Andrew White2010-06-202-4/+13
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Remove a relic of #request being in RackDelegationwycats2010-06-192-6/+9
| |
* | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-152-3/+3
|\ \ | |/ |/|
| * Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-112-3/+3
| |
* | edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-141-1/+1
|/ | | | not "ActiveRecord"
* class_attribute is not a direct replacement of class_inheritable_*.José Valim2010-06-101-3/+3
| | | | | | If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance.
* cache_sweeper yields blank outputNeeraj Singh2010-06-081-0/+1
| | | | | | [#3914 state:open] Signed-off-by: José Valim <jose.valim@gmail.com>
* regular expressions are usually ASCII-encoded, so force_encoding the content ↵wycats2010-06-071-0/+1
| | | | of a Node to the encoding of the regular expression is wrong.
* Make named helpers unprotected without becoming actions [#4696 state:resolved]wycats2010-06-071-0/+8
|
* Reset request.parameters after assigning params for functional testsJeremy Kemper2010-06-061-2/+4
|