Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revised a few details in session docs | Xavier Noria | 2008-05-07 | 1 | -12/+18 |
| | |||||
* | improvements to the page caching docs | Jonathan Dance | 2008-05-06 | 2 | -9/+15 |
| | |||||
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-05-06 | 1 | -5/+3 |
|\ | |||||
| * | Refactored and fixed Resources.map_member_actions to make use of custom ↵ | Marcos Arias | 2008-05-06 | 1 | -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] | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2008-05-06 | 2 | -4/+4 |
|\| | |||||
| * | Allow ActionController::Base#default_url_options to have a default options ↵ | Cheah Chu Yeow | 2008-05-05 | 2 | -4/+4 |
| | | | | | | | | | | | | argument of nil. This fixes a bug introduced in [6a6b4392c16c665eb713705f2b38e959a658eeef] which was breaking routing in ActionController::UrlWriter. | ||||
* | | revised conventions in url_for docs | Xavier Noria | 2008-05-05 | 1 | -7/+7 |
| | | |||||
* | | revised conventions in resources.rb | Xavier Noria | 2008-05-05 | 1 | -17/+17 |
| | | |||||
* | | revised convention for lists in request_forgery_protection.rb | Xavier Noria | 2008-05-05 | 1 | -2/+2 |
| | | |||||
* | | revised some conventions in polymorphic_routes.rb | Xavier Noria | 2008-05-04 | 1 | -8/+10 |
| | | |||||
* | | revised conventions for lists of options in action_controller/base.rb | Xavier Noria | 2008-05-04 | 1 | -11/+11 |
| | | |||||
* | | revised conventions for lists of options in selector_assertions.rb | Xavier Noria | 2008-05-04 | 1 | -13/+13 |
|/ | |||||
* | Ensure that default_url_options, if defined, are used in named routes. | Cheah Chu Yeow | 2008-05-04 | 2 | -5/+5 |
| | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#22 state:resolved] | ||||
* | Improve documentation coverage and markup | Xavier Noria | 2008-05-02 | 18 | -187/+230 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-01 | 1 | -3/+6 |
|\ | |||||
| * | Accept header mime parser can now deal with empty fields | Tobias Lütke | 2008-05-01 | 1 | -3/+6 |
| | | |||||
* | | Made the location of the routes file configurable with ↵ | David Heinemeier Hansson | 2008-05-01 | 1 | -6/+6 |
|/ | | | | config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved] | ||||
* | Clarify confusing ActionController::Base.allow_concurrency flag. | Jeremy Kemper | 2008-04-28 | 1 | -3/+4 |
| | |||||
* | Ruby 1.9 compat: force assert_select text encoding to the encoding of the ↵ | Jeremy Kemper | 2008-04-28 | 1 | -1/+4 |
| | | | | regexp it's matching against. | ||||
* | Added ActionController::TestCase#rescue_action_in_public! to control whether ↵ | David Heinemeier Hansson | 2008-04-27 | 1 | -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 it | David Heinemeier Hansson | 2008-04-27 | 1 | -1/+1 |
| | |||||
* | Make sure member names aren't mistakenly set to nil when providing :path_names | Eugene Pimenov | 2008-04-23 | 1 | -1/+1 |
| | | | | | | [#19 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Delegate ivars to controller instead of copying | Pratik Naik | 2008-04-21 | 1 | -1/+2 |
| | | | | | Reduce number of instance variables being copied from controller to view. Instead, delegate them to controller instance. | ||||
* | Remove ActionController::Base#view_controller_internals | Pratik Naik | 2008-04-21 | 2 | -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_assigns | Pratik Naik | 2008-04-21 | 1 | -7/+0 |
| | |||||
* | Add conditional options to caches_page method [#25 state:resolved] | Paul Horsfall | 2008-04-19 | 1 | -2/+10 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Remove unused ignore_missing_templates option | Pratik Naik | 2008-04-19 | 1 | -4/+1 |
| | |||||
* | Move missing template logic to ActionView | Pratik Naik | 2008-04-19 | 3 | -17/+2 |
| | |||||
* | Introduce ActionView::InlineTemplate class | Pratik Naik | 2008-04-19 | 1 | -1/+1 |
| | |||||
* | Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in ↵ | Pratik Naik | 2008-04-18 | 1 | -40/+33 |
| | | | | production environment. | ||||
* | Tidy up ActiveSupport::Callbacks::CallbackChain instance API. | Joshua Peek | 2008-04-17 | 2 | -4/+4 |
| | |||||
* | Added Rails.public_path to control where HTML and assets are expected to be ↵ | David Heinemeier Hansson | 2008-04-13 | 3 | -4/+4 |
| | | | | loaded from (defaults to Rails.root + "/public") #11581 [nicksieger] | ||||
* | Merge branch 'master' into custom_paths_for_resource_names | Michael Koziarski | 2008-04-12 | 1 | -6/+7 |
|\ | |||||
| * | Ruby 1.9 compat: workaround module_eval issue | Jeremy Kemper | 2008-04-11 | 1 | -6/+7 |
| | | |||||
* | | Allow alternative values for the 'new' and 'edit' actions in resourceful routes. | Michael Koziarski | 2008-04-12 | 2 | -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 Hansson | 2008-04-11 | 1 | -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 Olson | 2008-04-08 | 2 | -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 Peek | 2008-04-06 | 1 | -0/+9 |
| | | | | | | #10839 [Josh Peek] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Improve documentation. | Pratik Naik | 2008-04-05 | 1 | -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 Peek | 2008-04-04 | 1 | -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 fixes | Jeremy Kemper | 2008-04-01 | 1 | -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 call | Jeremy Kemper | 2008-04-01 | 1 | -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 Hansson | 2008-03-29 | 1 | -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 spoofing | Jeremy Kemper | 2008-03-28 | 1 | -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 Kemper | 2008-03-28 | 1 | -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 Hansson | 2008-03-28 | 4 | -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 Hansson | 2008-03-28 | 1 | -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 Hansson | 2008-03-28 | 1 | -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 Naik | 2008-03-26 | 1 | -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 Olson | 2008-03-23 | 1 | -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 |