Skip to content
Commits on May 21, 2012
  1. More info on commit messages in contributing guide

    Rails git history does not look too well when you try to figure out why
    particular changes were introduced. We can do much better than that and
    it's never too late to start.
    committed May 20, 2012
Commits on May 20, 2012
  1. Fix generators to help with ambiguous `ApplicationController` issue

    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
    committed May 20, 2012
  2. @josevalim

    Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806…

    …f7b028614c
    
    Template concurrency fixes
    Conflicts:
    
    	actionpack/lib/action_view/template.rb
    josevalim committed May 20, 2012
  3. @rafaelfranca

    Fix CHANGELOG order and add a brief description of the changes in the

    Action Pack in the upgrading guide. [ci skip]
    rafaelfranca committed May 20, 2012
  4. @carlosantoniodasilva

    Merge pull request #6408 from ivankukobko/master

    Fixed typo in AR test name
    carlosantoniodasilva committed May 20, 2012
  5. @ivankukobko

    fixed typo in word finiding

    ivankukobko committed May 20, 2012
  6. Revert "Merge pull request #5702 from oscardelben/patch-4"

    This reverts commit cae1ca7, reversing
    changes made to da97cf0.
    
    These changes break the build, it needs more investigation.
    committed May 20, 2012
  7. @pixeltrix

    Escape the extension when normalizing the action cache path.

    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
    pixeltrix committed May 20, 2012
  8. @pixeltrix

    Return 400 Bad Request for URL paths with invalid encoding.

    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
    pixeltrix committed May 20, 2012
  9. @pixeltrix

    Raise ActionController::BadRequest for malformed parameter hashes.

    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
    pixeltrix committed May 20, 2012
  10. @pixeltrix
  11. @vijaydev

    fix closing tag [ci skip]

    vijaydev committed May 20, 2012
  12. @josevalim

    Merge pull request #6399 from dchelimsky/issue-5899

    Raise Assertion instead of RoutingError for routing assertion failures.
    josevalim committed May 20, 2012
  13. @dchelimsky

    Raise Assertion instead of RoutingError for routing assertion failures.

    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
    dchelimsky committed May 19, 2012
  14. @josevalim

    Merge pull request #6050 from route/wrapped_keys_in_log

    Show in log correct wrapped keys
    josevalim committed May 20, 2012
  15. Improve docs for `try` by adding note on `BasicObject`

    [ci skip] closes #5790
    committed May 20, 2012
  16. Merge pull request #5702 from oscardelben/patch-4

    Call undefine_attribute_methods only when defining new attributes
    committed May 19, 2012
  17. @route

    Show in log correct wrapped keys

    route committed Apr 29, 2012
  18. Merge pull request #5631 from avakhov/ac-log-subsriber-small-refac

    Make AC::LogSubscriber#send_file like #send_data
    committed May 19, 2012
Commits on May 19, 2012
  1. @tenderlove

    Merge pull request #6397 from kennyj/fix_translate_exception

    Fix a problem of translate_exception method in a Japanese (non English) environment.
    tenderlove committed May 19, 2012
  2. @tenderlove

    Merge pull request #6398 from pmahoney/threadsafe-connection-pool

    Synchronize read and modification of @reserved_connections
    tenderlove committed May 19, 2012
  3. @pmahoney

    Synchronize read and modification of @reserved_connections hash to av…

    …oid concurrency error.
    pmahoney committed May 19, 2012
  4. @kennyj
  5. @rafaelfranca

    Merge pull request #6396 from kennyj/dont_use_assert_block

    Don't use assert_block method. It will be removed.
    rafaelfranca committed May 19, 2012
  6. @rafaelfranca

    Merge pull request #3359 from mrreynolds/datamapper_naming_fix

    Fixed DataMapper namings in symbols and constants.
    rafaelfranca committed May 19, 2012
  7. @kennyj
  8. @rafaelfranca

    Merge pull request #6395 from kennyj/fix_warning_20120519-2

    Fix warning: shadowing outer local variable - constant.
    rafaelfranca committed May 19, 2012
  9. @kennyj
  10. @pixeltrix
  11. @pixeltrix
  12. @marcandre @pixeltrix
  13. @marcandre @pixeltrix
  14. @vijaydev
  15. @vijaydev

    copy edits [ci skip]

    vijaydev committed May 19, 2012
  16. add CollectionProxy#last documentation

    Francesco Rodriguez committed May 19, 2012
Something went wrong with that request. Please try again.