aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
...
* Use CGI::Cookie::parse for request cookies until we officially deprecated CGI.Joshua Peek2008-06-041-38/+4
|
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-06-031-1/+1
|\
| * Fix assert_redirected_to for nested controllers and named routesGabe da Silveira2008-06-041-1/+1
| | | | | | | | | | | | [#308 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and ↵David Heinemeier Hansson2008-06-031-4/+5
|/ | | | HTTP_X_FORWARDED_FOR doesnt match (not just if theyre both present) [Mark Imbriaco, Bradford Folkens]
* Allow caches_action to accept a layout option [#198 state:resolved]josevalim2008-06-031-3/+17
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ↵Joshua Peek2008-06-032-2/+2
| | | | ActiveSupport [#238 state:resolved]
* Ensure Rack processor reads CGI output_cookies for the session cookie.Joshua Peek2008-06-022-4/+8
|
* Added Rack processorEzra Zygmuntowicz2008-06-012-1/+328
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Ruby 1.8.7 compat: work around broken DelegateClass#respond_to?Jeremy Kemper2008-05-311-0/+6
|
* Require ruby-prof 0.6.1 or later. Use resume/pause to omit extraneous ↵Jeremy Kemper2008-05-301-8/+17
| | | | machinery from profile.
* Merge docrails.Pratik Naik2008-05-2516-100/+99
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ruby 1.9 compat: ensure binary encoding for post body parsingJeremy Kemper2008-05-195-12/+25
|
* Add fragment_exist? and exist? methods to cache stores. [#203 state:resolved]José Valim2008-05-191-1/+12
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Merge documentation changes from docrails.Pratik Naik2008-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0fc3381aa5359f31b36057d7bfba2e0eb6a3c064 Author: Xavier Noria <fxn@hashref.com> Date: Fri May 16 23:44:51 2008 +0200 Conventions. Formatting. Revising docs all over the rails. This revision encourages the modern resource-oriented form_for usage. In addition corrects some markup and other details. commit 70e4bcf5cb039bea073851faed2df9f465e6f2f8 Author: Chris Kampmeier <chris@kampers.net> Date: Fri May 16 12:09:46 2008 -0700 Fix a couple spelling errors in docs commit 6ea5e4208f724b50e774e6a1af027336c3ee3de1 Author: Chris O'Sullivan <thechrisoshow@gmail.com> Date: Fri May 16 16:09:11 2008 +0100 Added docs about source_type for has_one association commit a01a0178be297b0eb62909819a15a01c6b69a841 Author: miloops <miloops@gmail.com> Date: Wed May 14 09:22:39 2008 +0000 Change migration generator USAGE to explain the timestamped migrations behaviour commit 4e2bc02163aa646ab1304b1b5bec98a7af8927f5 Author: Xavier Noria <fxn@hashref.com> Date: Fri May 16 00:43:03 2008 +0200 minor revision in url_for docs Made explicit that RESTful and controller/action styles are not interchangeable, and revised some markup. commit d6ecce66f4e125531875006eea8022b73fe135b5 Author: Michael Hartl <michael@michaelhartl.com> Date: Thu May 15 10:46:40 2008 -0700 Expanded and updated the link_to documentation commit b8c46c86f0b785f6afc3c58eeb1b347543f5901e Author: Cody Fauser <cody@jadedpixel.com> Date: Wed May 14 09:10:02 2008 -0400 Improve and cleanup ActionMailer documentation commit 9546ee299952c86329c4854f9b3776382c0575ff Author: Yehuda Katz <wycats@gmail.com> Date: Mon May 12 23:41:43 2008 -0700 Add documentation for Inflector.inflections commit cbd5db8f5165f013069b02414f9bf762d88f619f Author: Manik Juneja <mjuneja@manik-junejas-computer.local> Date: Mon May 12 23:43:31 2008 +0530 minor changes in railties/README. Added dbconsole introduction commit 130a280ddee1f96ccf378b52c17ee742b5e54f4a Author: Gaurav Sharma <gaurav@norbauer.com> Date: Mon May 12 18:00:19 2008 +0530 adding documentation for cached_attributes commit 164c9586480f0a02522ea15ec7fb42c6a783a74d Author: TomK32 <tomk32@tomk32.de> Date: Mon May 12 10:59:33 2008 +0200 proper heading for "Example:" commit 35634feb474cc55fbc95edeffe98cec241d45f23 Author: Matt Boehlig <thetamind@gmail.com> Date: Sun May 11 16:46:07 2008 -0500 Cleanup whitespace and change_table documentation commit 80bba28a1a56a0cafeb0fc94659905e88129bc31 Author: Xavier Noria <fxn@hashref.com> Date: Sun May 11 02:54:02 2008 +0200 documented the source annotation extractor commit e6823bb1650d9b0fea58bd2d355f388961a408b3 Author: Mike Mondragon <mikemondragon@gmail.com> Date: Fri May 9 13:49:56 2008 -0700 Added additional information about processing email with ActionMailer and the strategy one might want to employ to do so. commit e6afd8b2736364322b673bbdcca3e9b38b6d3da0 Author: Xavier Noria <fxn@hashref.com> Date: Thu May 8 23:49:36 2008 +0200 corrected and completed docs of increment/decrement/toggle in AR::Base commit 2fead68b3192332eee27945ed95a94a64ca73f70 Author: Austin Putman <austin@emmanuel.local> Date: Wed May 7 19:35:46 2008 -0700 Documented class methods on ActionController::Routing. These are dangerous, and mostly used for testing. commit f5b84182dbc39bea79c8ee319c688d00fa99f9d1 Author: Teflon Ted <github@rudiment.net> Date: Wed May 7 16:08:49 2008 -0400 Added explanation about errant inflections not being patched in the future in order to avoid breaking legacy applications. commit 370f4f51722cec49ace17093d29e9ce9e8f15cfb Author: Sunny Ripert <negatif@gmail.com> Date: Wed May 7 14:00:59 2008 +0200 Applied list conventions in AR::Base commit 5bd18429f09d44e75191bec42a6db04bd33f3030 Author: Sunny Ripert <negatif@gmail.com> Date: Wed May 7 13:53:35 2008 +0200 Renamed Options list to Attributes list whenever they weren't option hashes in AR::Base commit 2fa628e34b25166afb49e3afeea87e770ab84256 Author: Xavier Noria <fxn@hashref.com> Date: Wed May 7 11:52:33 2008 +0200 revised details in Exceptions section of AR::Base docs commit d912bd5672316454457ae83f6e9dda5197beeb6f Author: Yaroslav Markin <yaroslav@markin.net> Date: Wed May 7 13:50:28 2008 +0400 Add a filter_parameter_logging usage hint to generated ApplicationController. This may help to remind the developer to filter sensitive information from application logs. Closes #11578 commit f81d771f0657ae8375b84a77a059812cce5d6fd9 Author: Jack Danger Canty <git@6brand.com> Date: Tue May 6 23:35:05 2008 -0700 doc: ActiveRecord::Reflection::AssociationReflection#through_reflection Added documentation demonstrating the use of #through_reflection for finding intervening reflection objects for HasManyThrough and HasOneThrough. commit ae6b46f00b5b8b2939c6b37ce3329c83de7e71db Author: Cheah Chu Yeow <chuyeow@gmail.com> Date: Wed May 7 13:47:41 2008 +0800 Document AttributeAssignmentError and MultiparameterAssignmentErrors. commit 8f463550b597db2156b67733f31aed13487fbc3a Author: John Barnette <jbarnette@gmail.com> Date: Tue May 6 22:46:44 2008 -0700 Killing/fixing a bunch of outdated language in the AR README. commit 284a930a93fbee16e25d06392779dbf2f03e9e12 Author: Jonathan Dance <jd@wuputah.com> Date: Tue May 6 14:58:26 2008 -0400 improvements to the page caching docs commit 9482da621390c874da7c921c8bd6230caae7035a Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 18:13:40 2008 +0200 validates_numericality_of() "integer" option really is "only_integer" commit e9afd6790a8f530528f6597a7f59bb283be754f6 Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 12:11:59 2008 +0200 Harmonized hash notation in AR::Base commit 67ebf14a91ffd970b582be4ff2991d691a9cf3e1 Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 12:06:19 2008 +0200 Turned options into rdoc-lists in AR::Base commit 0ec7c0a41d889d4e5382b9dff72f1aaba89bf297 Author: Marshall Huss <mwhuss@Macbook.local> Date: Sun May 4 23:21:33 2008 -0400 Added information of how to set element_name in the case the user has a name confliction with an existing model Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure routing generator works with non-string keys. [#172 state:resolved]Sven Fuchs2008-05-161-1/+1
| | | | | | | | | | Make sure that (with recent correction to globbed parameter escaping) non-string values can still be passed route generation helpers for globbed route segments. For example, foo_path([1, 2, 3]) should still work for a route like map.foo "*globbed" by implicitely calling to_s on the Fixnums. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Prefer string core_ext inflector methods over directly accessing Inflector.Joshua Peek2008-05-141-3/+3
|
* Protect #filter_parameters created by filter_parameter_logging [José Valim] ↵Joshua Peek2008-05-141-25/+26
| | | | [#196 state:resolved]
* Added conditional support to caches_action [José Valim] [#166 state:resolved]Joshua Peek2008-05-141-18/+19
|
* make CGI::Cookie handle deleting a cookie properlyRich Cavanaugh2008-05-131-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge branch 'master' of git@github.com:rails/railsrick2008-05-136-17/+18
|\
| * Don't double-escape cookie store data. Don't split cookie values with ↵Rich Cavanaugh2008-05-122-4/+7
| | | | | | | | | | | | newlines into an array. [#130 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Simpler rescue_action conditionJeremy Kemper2008-05-121-4/+2
| |
| * Bug: Earlier Check for Session in Forgery ProtectionPeter Jones2008-05-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The session is used by the form_authenticity_token method before it is tested to be valid. This patch moves a few lines around so that the session is validated first. Without this patch, if you try to use forgery protection with sessions turned off, you get this exception message: undefined method `session_id' for {}:Hash The patch includes a test that can be used to see this behavior before the request_forgery_protection.rb file is patched to fix it.
| * Added session(:on) to turn session management back on in a controller ↵David Heinemeier Hansson2008-05-111-0/+5
| | | | | | | | subclass if the superclass turned it off (Peter Jones) [#136 state:resolved]
| * Fixed flash.now not being accessible in tests. Flash sweeping is now done ↵Andreas Neuhaus2008-05-111-6/+1
| | | | | | | | | | | | | | | | before action processing instead after Signed-off-by: Michael Koziarski <michael@koziarski.com> [#10 state:resolved]
* | fix merge conflict with actionpack changelogrick2008-05-1012-109/+160
|\|
| * Make render shorthands work with namespaced controllersJacek Becela2008-05-101-4/+10
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Escape globbed parameters in routes correctly.Chris Roos2008-05-101-4/+5
| | | | | | | | | | | | :controller => 'glob', :action=> 'show', :additional => ['foo/bar', 'baz'] Should generate /glob/show/foo%2Fbar/baz not /glob/show/foo/bar/baz
| * Merge docrails:Pratik Naik2008-05-0910-96/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e6afd8b2736364322b673bbdcca3e9b38b6d3da0 Author: Xavier Noria <fxn@hashref.com> Date: Thu May 8 23:49:36 2008 +0200 Overall documentation improvement and markup corrections. Zillion changes. commit 2fead68b3192332eee27945ed95a94a64ca73f70 Author: Austin Putman <austin@emmanuel.local> Date: Wed May 7 19:35:46 2008 -0700 Documented class methods on ActionController::Routing. These are dangerous, and mostly used for testing. commit f5b84182dbc39bea79c8ee319c688d00fa99f9d1 Author: Teflon Ted <github@rudiment.net> Date: Wed May 7 16:08:49 2008 -0400 Added explanation about errant inflections not being patched in the future in order to avoid breaking legacy applications. commit 370f4f51722cec49ace17093d29e9ce9e8f15cfb Author: Sunny Ripert <negatif@gmail.com> Date: Wed May 7 14:00:59 2008 +0200 Applied list conventions in AR::Base commit 5bd18429f09d44e75191bec42a6db04bd33f3030 Author: Sunny Ripert <negatif@gmail.com> Date: Wed May 7 13:53:35 2008 +0200 Renamed Options list to Attributes list whenever they weren't option hashes in AR::Base commit d912bd5672316454457ae83f6e9dda5197beeb6f Author: Yaroslav Markin <yaroslav@markin.net> Date: Wed May 7 13:50:28 2008 +0400 Add a filter_parameter_logging usage hint to generated ApplicationController. This may help to remind the developer to filter sensitive information from application logs. Closes #11578 commit b243de0db3c2605121e055079854af5090d06374 Author: Jack Danger Canty <git@6brand.com> Date: Tue May 6 23:39:47 2008 -0700 doc: disambiguating an example ActiveRecord class commit f81d771f0657ae8375b84a77a059812cce5d6fd9 Author: Jack Danger Canty <git@6brand.com> Date: Tue May 6 23:35:05 2008 -0700 doc: ActiveRecord::Reflection::AssociationReflection#through_reflection Added documentation demonstrating the use of #through_reflection for finding intervening reflection objects for HasManyThrough and HasOneThrough. commit ae6b46f00b5b8b2939c6b37ce3329c83de7e71db Author: Cheah Chu Yeow <chuyeow@gmail.com> Date: Wed May 7 13:47:41 2008 +0800 Document AttributeAssignmentError and MultiparameterAssignmentErrors. commit 8f463550b597db2156b67733f31aed13487fbc3a Author: John Barnette <jbarnette@gmail.com> Date: Tue May 6 22:46:44 2008 -0700 Killing/fixing a bunch of outdated language in the AR README. commit aca44bcd92ef783abdf484b58abdde6786db0f89 Author: Cheah Chu Yeow <chuyeow@gmail.com> Date: Wed May 7 13:34:52 2008 +0800 Make a note about ActiveResource::Timeouterror being raised when ARes calls timeout. commit 284a930a93fbee16e25d06392779dbf2f03e9e12 Author: Jonathan Dance <jd@wuputah.com> Date: Tue May 6 14:58:26 2008 -0400 improvements to the page caching docs commit 9482da621390c874da7c921c8bd6230caae7035a Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 18:13:40 2008 +0200 validates_numericality_of() "integer" option really is "only_integer" commit e9afd6790a8f530528f6597a7f59bb283be754f6 Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 12:11:59 2008 +0200 Harmonized hash notation in AR::Base commit 67ebf14a91ffd970b582be4ff2991d691a9cf3e1 Author: Sunny Ripert <negatif@gmail.com> Date: Mon May 5 12:06:19 2008 +0200 Turned options into rdoc-lists in AR::Base commit 0ec7c0a41d889d4e5382b9dff72f1aaba89bf297 Author: Marshall Huss <mwhuss@Macbook.local> Date: Sun May 4 23:21:33 2008 -0400 Added information of how to set element_name in the case the user has a name confliction with an existing model Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Refactored and fixed Resources.map_member_actions to make use of custom ↵Marcos Arias2008-05-061-5/+3
| | | | | | | | | | | | | | ActionController::Base.resources_path_names when the option :path_names is not directly specified. Added a specific test for this functionality and fixed assert_restful_routes_for test helper to make use of ActionController::Base.resources_path_names instead of just "new" or "edit". Signed-off-by: Michael Koziarski <michael@koziarski.com> [#111 state:resolved]
* | change ActionController::RequestForgeryProtection to use ↵rick2008-05-063-5/+18
| | | | | | | | Mime::Type#verify_request? [#73]
* | Change the request forgery protection to go by Content-Type instead of ↵rick2008-05-061-1/+1
|/ | | | request.format so that you can't bypass it by POSTing to "#{request.uri}.xml" [#73 state:resolved]
* Allow ActionController::Base#default_url_options to have a default options ↵Cheah Chu Yeow2008-05-052-4/+4
| | | | | | argument of nil. This fixes a bug introduced in [6a6b4392c16c665eb713705f2b38e959a658eeef] which was breaking routing in ActionController::UrlWriter.
* Ensure that default_url_options, if defined, are used in named routes.Cheah Chu Yeow2008-05-042-5/+5
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#22 state:resolved]
* Improve documentation coverage and markupXavier Noria2008-05-0218-187/+230
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-011-3/+6
|\
| * Accept header mime parser can now deal with empty fieldsTobias Lütke2008-05-011-3/+6
| |
* | Made the location of the routes file configurable with ↵David Heinemeier Hansson2008-05-011-6/+6
|/ | | | config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved]
* Clarify confusing ActionController::Base.allow_concurrency flag.Jeremy Kemper2008-04-281-3/+4
|
* Ruby 1.9 compat: force assert_select text encoding to the encoding of the ↵Jeremy Kemper2008-04-281-1/+4
| | | | regexp it's matching against.
* Added ActionController::TestCase#rescue_action_in_public! to control whether ↵David Heinemeier Hansson2008-04-271-2/+21
| | | | the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [DHH]
* Changing "and" to && whereever I catch itDavid Heinemeier Hansson2008-04-271-1/+1
|
* Make sure member names aren't mistakenly set to nil when providing :path_namesEugene Pimenov2008-04-231-1/+1
| | | | | | [#19 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Delegate ivars to controller instead of copyingPratik Naik2008-04-211-1/+2
| | | | | Reduce number of instance variables being copied from controller to view. Instead, delegate them to controller instance.
* Remove ActionController::Base#view_controller_internalsPratik Naik2008-04-212-29/+6
| | | | | | Get rid of ActionController::Base#view_controller_internals flag and use @@protected_view_variables for storing the list of controller specific instance variables which should be inaccessible inside views.
* Remove ActionController::Base#add_class_variables_to_assignsPratik Naik2008-04-211-7/+0
|
* Add conditional options to caches_page method [#25 state:resolved]Paul Horsfall2008-04-191-2/+10
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Remove unused ignore_missing_templates optionPratik Naik2008-04-191-4/+1
|
* Move missing template logic to ActionViewPratik Naik2008-04-193-17/+2
|
* Introduce ActionView::InlineTemplate classPratik Naik2008-04-191-1/+1
|