Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix generators to help with ambiguous `ApplicationController` issue | Piotr Sarnacki | 2012-05-20 | 4 | -5/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In development mode, dependencies are loaded dynamically at runtime, using `const_missing`. Because of that, when one of the constants is already loaded and `const_missing` is not triggered, user can end up with unexpected results. Given such file in an Engine: ```ruby module Blog class PostsController < ApplicationController end end ``` If you load it first, before loading any application files, it will correctly load `Blog::ApplicationController`, because second line will hit `const_missing`. However if you load `ApplicationController` first, the constant will be loaded already, `const_missing` hook will not be fired and in result `PostsController` will inherit from `ApplicationController` instead of `Blog::ApplicationController`. Since it can't be fixed in `AS::Dependencies`, the easiest fix is to just explicitly load application controller. closes #6413 | ||||
* | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c | José Valim | 2012-05-20 | 1 | -10/+22 |
| | | | | | | | Template concurrency fixes Conflicts: actionpack/lib/action_view/template.rb | ||||
* | Fix CHANGELOG order and add a brief description of the changes in the | Rafael Mendonça França | 2012-05-20 | 2 | -3/+7 |
| | | | | Action Pack in the upgrading guide. [ci skip] | ||||
* | Merge pull request #6408 from ivankukobko/master | Carlos Antonio da Silva | 2012-05-20 | 1 | -1/+1 |
|\ | | | | | Fixed typo in AR test name | ||||
| * | fixed typo in word finiding | Ivan Kukobko | 2012-05-20 | 1 | -1/+1 |
|/ | |||||
* | Revert "Merge pull request #5702 from oscardelben/patch-4" | Piotr Sarnacki | 2012-05-20 | 1 | -1/+3 |
| | | | | | | | This reverts commit cae1ca7d1be9c79c7ef012a1f62aef9d3bb815f8, reversing changes made to da97cf016a8ffd1f54f804cd881f393e5d6efc18. These changes break the build, it needs more investigation. | ||||
* | Escape the extension when normalizing the action cache path. | Andrew White | 2012-05-20 | 2 | -3/+33 |
| | | | | | | | | | Although no recognized formats use non-ASCII characters, sometimes they can be included in the :format parameter because of invalid URLS. To prevent encoding incompatibility errors we need to escape them before passing the path to URI.unescape. Closes #4379 | ||||
* | Return 400 Bad Request for URL paths with invalid encoding. | Andrew White | 2012-05-20 | 4 | -0/+51 |
| | | | | | | | | | Passing path parameters with invalid encoding is likely to trigger errors further on like `ArgumentError (invalid byte sequence in UTF-8)`. This will result in a 500 error whereas the better error to return is a 400 error which allows exception notification libraries to filter it out if they wish. Closes #4450 | ||||
* | Raise ActionController::BadRequest for malformed parameter hashes. | Andrew White | 2012-05-20 | 8 | -6/+47 |
| | | | | | | | | | | | | | | Currently Rack raises a TypeError when it encounters a malformed or ambiguous hash like `foo[]=bar&foo[4]=bar`. Rather than pass this through to the application this commit captures the exception and re-raises it using a new ActionController::BadRequest exception. The new ActionController::BadRequest exception returns a 400 error instead of the 500 error that would've been returned by the original TypeError. This allows exception notification libraries to ignore these errors if so desired. Closes #3051 | ||||
* | Correct order of expected and actual arguments | Andrew White | 2012-05-20 | 1 | -1/+1 |
| | |||||
* | fix closing tag [ci skip] | Vijay Dev | 2012-05-20 | 1 | -1/+1 |
| | |||||
* | Merge pull request #6399 from dchelimsky/issue-5899 | José Valim | 2012-05-20 | 4 | -18/+27 |
|\ | | | | | Raise Assertion instead of RoutingError for routing assertion failures. | ||||
| * | Raise Assertion instead of RoutingError for routing assertion failures. | David Chelimsky | 2012-05-20 | 4 | -18/+27 |
|/ | | | | | | | | | | | | | Before this change, assert_recognizes, assert_generates, and assert_routing raised ActionController::RoutingError when they failed to recognize the route. This commit changes them to raise Assertion instead. This aligns with convention for logical failures, and supports reporting tools that care about the difference between logical failures and errors e.g. the summary at the end of a test run. - Fixes #5899 | ||||
* | Merge pull request #6050 from route/wrapped_keys_in_log | José Valim | 2012-05-20 | 2 | -1/+10 |
|\ | | | | | Show in log correct wrapped keys | ||||
| * | Show in log correct wrapped keys | Dmitry Vorotilin | 2012-05-20 | 2 | -1/+10 |
| | | |||||
* | | Improve docs for `try` by adding note on `BasicObject` | Piotr Sarnacki | 2012-05-20 | 1 | -0/+4 |
| | | | | | | | | [ci skip] closes #5790 | ||||
* | | Merge pull request #5702 from oscardelben/patch-4 | Piotr Sarnacki | 2012-05-19 | 1 | -3/+1 |
|\ \ | |/ |/| | Call undefine_attribute_methods only when defining new attributes | ||||
| * | Call undefine_attribute_methods only when defining new attributes | Oscar Del Ben | 2012-05-18 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #5631 from avakhov/ac-log-subsriber-small-refac | Piotr Sarnacki | 2012-05-19 | 1 | -3/+1 |
|\ \ | | | | | | | Make AC::LogSubscriber#send_file like #send_data | ||||
| * | | Make AC::LogSubscriber#send_file like #send_data | Alexey Vakhov | 2012-05-19 | 1 | -3/+1 |
| | | | |||||
* | | | Merge pull request #6397 from kennyj/fix_translate_exception | Aaron Patterson | 2012-05-19 | 1 | -3/+7 |
|\ \ \ | | | | | | | | | Fix a problem of translate_exception method in a Japanese (non English) environment. | ||||
| * | | | Fix a problem of translate_exception method in Japanese. | kennyj | 2012-05-20 | 1 | -3/+7 |
| | | | | |||||
* | | | | Merge pull request #6398 from pmahoney/threadsafe-connection-pool | Aaron Patterson | 2012-05-19 | 1 | -4/+8 |
|\ \ \ \ | |/ / / |/| | | | Synchronize read and modification of @reserved_connections | ||||
| * | | | Synchronize read and modification of @reserved_connections hash to avoid ↵ | Patrick Mahoney | 2012-05-19 | 1 | -4/+8 |
|/ / / | | | | | | | | | | concurrency error. | ||||
* | | | Merge pull request #6396 from kennyj/dont_use_assert_block | Rafael Mendonça França | 2012-05-19 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Don't use assert_block method. It will be removed. | ||||
| * | | | Don't use assert_block method. It will be deprecated. | kennyj | 2012-05-20 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #3359 from mrreynolds/datamapper_naming_fix | Rafael Mendonça França | 2012-05-19 | 4 | -13/+13 |
|\ \ \ \ | |/ / / |/| | | | Fixed DataMapper namings in symbols and constants. | ||||
| * | | | Fixed DataMapper namings in symbols and constants. | Robert Glaser | 2011-10-18 | 4 | -13/+13 |
| | | | | |||||
* | | | | Merge pull request #6395 from kennyj/fix_warning_20120519-2 | Rafael Mendonça França | 2012-05-19 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Fix warning: shadowing outer local variable - constant. | ||||
| * | | | | Fix warning: shadowing outer local variable - constant. | kennyj | 2012-05-19 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Add CHANGELOG entry for constantize - closes #6165. | Andrew White | 2012-05-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | Handle case where ancestor is not the end of the chain | Andrew White | 2012-05-19 | 2 | -7/+14 |
| | | | | |||||
* | | | | Fix constantize so top level constants are looked up properly. | Marc-Andre Lafortune | 2012-05-19 | 2 | -1/+19 |
| | | | | |||||
* | | | | Make constantize look down the ancestor chain (excluding Object) | Marc-Andre Lafortune | 2012-05-19 | 2 | -1/+30 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-19 | 9 | -34/+315 |
|\ \ \ \ | |||||
| * | | | | copy edits [ci skip] | Vijay Dev | 2012-05-19 | 1 | -17/+20 |
| | | | | | |||||
| * | | | | add CollectionProxy#last documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+27 |
| | | | | | |||||
| * | | | | add CollectionProxy#first documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+27 |
| | | | | | |||||
| * | | | | copy edits [ci skip] | Vijay Dev | 2012-05-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Revert "You can add a custom primary key to a table" | Vijay Dev | 2012-05-19 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 23a98ffbd9b39ee70094ded1671cf1879d0d3591. [ci skip] | ||||
| * | | | | fix typo. probem => problem | Damien Mathieu | 2012-05-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | improve CollectionProxy#concat documentation | Francesco Rodriguez | 2012-05-19 | 1 | -7/+18 |
| | | | | | |||||
| * | | | | fix CollectionProxy#<< documentation | Francesco Rodriguez | 2012-05-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add CollectionProxy#<< documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+20 |
| | | | | | |||||
| * | | | | add CollectionProxy#clear documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+26 |
| | | | | | |||||
| * | | | | add CollectionProxy#include? documentation | Francesco Rodriguez | 2012-05-18 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | minor fix wrapper tag documentation | Francesco Rodriguez | 2012-05-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | You can add a custom primary key to a table | Avi Tzurel | 2012-05-19 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Minor fix to the wrapper tag documentation, the options hash is the last ↵ | Avi Tzurel | 2012-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | one, added blank hash before that in the args list | ||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Avi Tzurel | 2012-05-19 | 6 | -130/+155 |
| |\ \ \ \ |