aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
|
* Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in ↵Pratik Naik2008-04-181-40/+33
| | | | production environment.
* Tidy up ActiveSupport::Callbacks::CallbackChain instance API.Joshua Peek2008-04-172-4/+4
|
* Added Rails.public_path to control where HTML and assets are expected to be ↵David Heinemeier Hansson2008-04-133-4/+4
| | | | loaded from (defaults to Rails.root + "/public") #11581 [nicksieger]
* Merge branch 'master' into custom_paths_for_resource_namesMichael Koziarski2008-04-121-6/+7
|\
| * Ruby 1.9 compat: workaround module_eval issueJeremy Kemper2008-04-111-6/+7
| |
* | Allow alternative values for the 'new' and 'edit' actions in resourceful routes.Michael Koziarski2008-04-122-3/+22
|/ | | | | | map.resource :schools, :as => 'escuelas', :path_names => { :new => 'nueva' } Closes #11181. [ivanvr]
* Fixed that formatted_polymorphic_route should be able to take the :format as ↵David Heinemeier Hansson2008-04-111-1/+11
| | | | part of a single hash or as the option hash (references #8741)
* Automatically parse posted JSON content for Mime::JSON requests. [rick]Rick Olson2008-04-082-6/+14
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Provide a helper proxy to access helper methods from outside views. Closes ↵Josh Peek2008-04-061-0/+9
| | | | | | #10839 [Josh Peek] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Improve documentation.Pratik Naik2008-04-051-2/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9226 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Replaced callback method evaluation in AssociationCollection class to use ↵Josh Peek2008-04-041-2/+8
| | | | | | ActiveSupport::Callbacks. Modified ActiveSupport::Callbacks::Callback#call to accept multiple arguments. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9225 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ruby 1.9 compat: encoding and multibyte test fixesJeremy Kemper2008-04-011-22/+20
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ruby 1.9 compat: don't confuse with headers method callJeremy Kemper2008-04-011-3/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Removed the default .htaccess configuration as there are so many good ↵David Heinemeier Hansson2008-03-291-1/+1
| | | | | | deployment options now (kept it as an example in README) [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9134 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Avoid remote_ip spoofingJeremy Kemper2008-03-281-13/+28
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9124 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Inspect options hashes in RenderError message so it's actually readable. ↵Jeremy Kemper2008-03-281-2/+2
| | | | | | Closes #11435 [court3nay] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9123 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added support for regexp flags like ignoring case in the :requirements part ↵David Heinemeier Hansson2008-03-284-5/+44
| | | | | | of routes declarations (closes #11421) [NeilW] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9115 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed that ActionController::Base#read_multipart would fail if boundary was ↵David Heinemeier Hansson2008-03-281-1/+0
| | | | | | exactly 10240 bytes (closes #10886) [ariejan] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9113 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed HTML::Tokenizer (used in sanitize helper) didnt handle unclosed CDATA ↵David Heinemeier Hansson2008-03-281-1/+1
| | | | | | tags (closes #10071) [esad, packagethief] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Improve documentation.Pratik Naik2008-03-261-0/+7
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9093 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix regression from filter refactoring where re-adding a skipped filter ↵Rick Olson2008-03-231-0/+3
| | | | | | resulted in it being called twice. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9080 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix an edge case with extra periods in Routing.normalize_paths. Closes ↵Jeremy Kemper2008-03-211-2/+2
| | | | | | #11337 [cavalle, veejar] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9069 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* assert_response, don't cry if @exception isn't available in the templateJeremy Kemper2008-03-181-1/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9059 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Refactor filters to use Active Support callbacks. Closes #11235.Jeremy Kemper2008-03-182-407/+263
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9055 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed that polymorphic routes would modify the input array (closes #11363) ↵David Heinemeier Hansson2008-03-171-0/+4
| | | | | | [thomas.lee] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Docfix (closes #11249) [juanjo.bazan]David Heinemeier Hansson2008-03-151-0/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9033 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed that cache fetch method would cause nil exception when called with no ↵David Heinemeier Hansson2008-03-151-1/+1
| | | | | | options (closes #11253) [remy] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9032 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix more obscure nested parameter hash parsing bug. Closes #10797 [thomas.lee]Rick Olson2008-03-131-1/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9020 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix nested parameter hash parsing bug. #10797 [thomas.lee]Rick Olson2008-03-111-0/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9010 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Allow using named routes in ActionController::TestCase before any request ↵Pratik Naik2008-03-081-2/+2
| | | | | | has been made. Closes #11273 [alloy] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8992 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed that sweepers defined by cache_sweeper will be added regardless of the ↵David Heinemeier Hansson2008-03-081-3/+2
| | | | | | perform_caching setting. Instead, control whether the sweeper should be run with the perform_caching setting. This makes testing easier when you want to turn perform_caching on/off [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8990 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Make MimeResponds::Responder#any work without explicit types. Closes #11140 ↵Pratik Naik2008-03-071-2/+6
| | | | | | [jaw6] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8987 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Better error message for type conflicts when parsing params. Closes #7962 ↵Rick Olson2008-03-071-1/+1
| | | | | | [spicycode, matt] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8986 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Remove unused ActionController::Base.template_class. Closes #10787Pratik Naik2008-03-051-8/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8985 5ecf4fe2-1ee6-0310-87b1-e25e094e27de