aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:rails/railsrick2008-05-1322-29/+112
|\
| * Don't double-escape cookie store data. Don't split cookie values with ↵Rich Cavanaugh2008-05-124-6/+26
| | | | | | | | | | | | newlines into an array. [#130 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Simpler rescue_action conditionJeremy Kemper2008-05-121-4/+2
| |
| * Updated copyright yearsDavid Heinemeier Hansson2008-05-117-7/+7
| |
| * Making ready for RC1 releaseDavid Heinemeier Hansson2008-05-113-3/+3
| |
| * Added not to sanitize helper docs that it doesn't guarantee well-formed markup.Michael Schuerig2008-05-121-0/+5
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#166 state:resolved]
| * Fixed that forgery protection can be used without session tracking (Peter ↵David Heinemeier Hansson2008-05-111-0/+2
| | | | | | | | Jones) [#139 state:resolved]
| * Bug: Earlier Check for Session in Forgery ProtectionPeter Jones2008-05-112-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-112-0/+27
| | | | | | | | subclass if the superclass turned it off (Peter Jones) [#136 state:resolved]
| * Added session(:on) to turn session management back on in a controller ↵David Heinemeier Hansson2008-05-111-0/+2
| | | | | | | | 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-112-6/+11
| | | | | | | | | | | | | | | | before action processing instead after Signed-off-by: Michael Koziarski <michael@koziarski.com> [#10 state:resolved]
* | fix merge conflict with actionpack changelogrick2008-05-1025-202/+493
|\|
| * Make render shorthands work with namespaced controllersJacek Becela2008-05-104-48/+195
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Escape globbed parameters in routes correctly.Chris Roos2008-05-102-9/+12
| | | | | | | | | | | | :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-0914-131/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * ActionView::InstanceTag#default_time_from_options with hash args uses ↵gbuesing2008-05-083-3/+29
| | | | | | | | Time.current as default; respects hash settings when time falls in system local spring DST gap
| * Adding Date.current, which returns Time.zone.today if config.time_zone is ↵gbuesing2008-05-083-1/+12
| | | | | | | | set; otherwise returns Date.today. ActionView date_helper uses Date.current to determine locale-appropriate default
| * Delegate action_name to controller inside views.Pratik Naik2008-05-062-1/+10
| |
| * Refactored and fixed Resources.map_member_actions to make use of custom ↵Marcos Arias2008-05-062-9/+29
| | | | | | | | | | | | | | 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-065-12/+84
| | | | | | | | Mime::Type#verify_request? [#73]
* | Change the request forgery protection to go by Content-Type instead of ↵rick2008-05-063-5/+28
|/ | | | request.format so that you can't bypass it by POSTing to "#{request.uri}.xml" [#73 state:resolved]
* Fixed form helper's name attribute for question methodsAndrew Vit2008-05-062-5/+18
|
* regression test for bug introduced in ↵rick2008-05-051-0/+13
| | | | [6a6b4392c16c665eb713705f2b38e959a658eeef] [Ian White] [#22 state:resolved]
* Allow ActionController::Base#default_url_options to have a default options ↵Cheah Chu Yeow2008-05-053-5/+5
| | | | | | 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-043-5/+39
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#22 state:resolved]
* Improve documentation coverage and markupXavier Noria2008-05-0230-278/+337
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Improve PartialTemplate testsPratik Naik2008-05-024-7/+13
|
* Capture view errors in ActionView::Template.Nathan Weizenbaum2008-05-024-13/+16
| | | | | | | This means that errors raised by partials are caught by ActionView::PartialTemplate, which in turn means they have the proper filename and line number information. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Fixed that TextHelper#text_field would corrypt when raw HTML was used as the ↵David Heinemeier Hansson2008-05-013-0/+19
| | | | value (mchenryc, Kevin Glowacz) [#80 state:resolved]
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-012-3/+13
|\
| * Accept header mime parser can now deal with empty fieldsTobias Lütke2008-05-012-3/+13
| |
* | Made the location of the routes file configurable with ↵David Heinemeier Hansson2008-05-012-6/+16
|/ | | | config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved]
* Fixed render :template for templates in top level of view path. [#54 ↵Pratik Naik2008-05-014-3/+30
| | | | state:resolved]
* Fixed labels that have a bracketed name and an index [#68 state:resolved]Kevin Glowacz2008-04-302-0/+13
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* FormHelper#label_tag accepts :for option [encoded] [#38 state:resolved]Joshua Peek2008-04-302-62/+72
|
* Forgot theseDavid Heinemeier Hansson2008-04-303-0/+8
|
* Fixed tests (and the weird assumption that no logger would mean that the ↵David Heinemeier Hansson2008-04-302-20/+8
| | | | code wasnt run)
* Added test for has_one partial rendering (keeran) [#43 state:resolved]David Heinemeier Hansson2008-04-303-1/+20
|
* Fixed render :partial => @collection.named_scope (nkallen) [#61 state:resolved]David Heinemeier Hansson2008-04-303-11/+9
|
* Implement increment/decrement on cache storage engines, using read/write by ↵Tobias Lütke2008-04-291-3/+2
| | | | default and using atomic command on memcache
* 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-282-5/+15
| | | | regexp it's matching against.
* Fixed that BenchmarkHelper should use controller.logger instead of @logger ↵David Heinemeier Hansson2008-04-271-3/+5
| | | | (which now apparently is gone)
* Added ActionController::TestCase#rescue_action_in_public! to control whether ↵David Heinemeier Hansson2008-04-272-2/+23
| | | | 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
|
* Pass template object to Handler#compilePratik Naik2008-04-244-4/+4
|
* Make sure member names aren't mistakenly set to nil when providing :path_namesEugene Pimenov2008-04-232-8/+39
| | | | | | [#19 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Delegate ivars to controller instead of copyingPratik Naik2008-04-214-10/+23
| | | | | Reduce number of instance variables being copied from controller to view. Instead, delegate them to controller instance.
* select_datetime and select_time default to Time.zone.now when ↵gbuesing2008-04-213-2/+22
| | | | config.time_zone is set
* datetime_select defaults to Time.zone.now when config.time_zone is setgbuesing2008-04-213-1/+39
|