Skip to content
Commits on Apr 22, 2013
  1. @rafaelfranca

    Move CHANGELOG entry to top

    [ci skip]
    rafaelfranca committed Apr 22, 2013
  2. @rafaelfranca

    Merge pull request #10096 from benofsky/fix_skipping_object_callback_…

    …filters
    
    Fixes skipping object callback filters
    rafaelfranca committed Apr 21, 2013
Commits on Apr 16, 2013
  1. @dasch

    Extract a base class from ActiveSupport::LogSubscriber

    Adds a ActiveSupport::Subscriber base class that LogSubscriber inherits
    from. By inheriting from Subscriber, other kinds of subscribers can take
    advantage of the event attachment system.
    dasch committed Apr 15, 2013
Commits on Apr 12, 2013
  1. @senny
Commits on Apr 11, 2013
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	guides/source/action_mailer_basics.md
    vijaydev committed Apr 11, 2013
Commits on Apr 6, 2013
  1. @agis-

    Fix markdown formatting

    agis- committed Apr 6, 2013
  2. @agis-
  3. @tenderlove
Commits on Apr 4, 2013
  1. @benmcredmond

    Fixes skipping object callback filters

    This allows you to skip callbacks that are defined by objects, e.g. for
    `ActionController`:
    
        skip_after_filter MySpecialFilter
    
    Previously this didn't work due to a bug in how Rails compared callbacks
    in `Callback#matches?`. When a callback is compiled, if it's an object
    filter (i.e. not a method, proc, etc.), `Callback` now defines a method on
    `@klass` that is derived from the class name rather than `@callback_id`.
    So, when `skip_callback` tries to find the appropriate callback to
    remove, `Callback` can regenerate the method name for the filter
    object and return the correct value for `Callback#matches?`.
    benmcredmond committed Jan 2, 2013
  2. @rafaelfranca

    Revert "Merge pull request #10034 from benofsky/fix_skipping_object_c…

    …allback_filters"
    
    This reverts commit c79c698, reversing
    changes made to ba4c274.
    
    This broke all the tests. See https://travis-ci.org/rails/rails/builds/6061839
    rafaelfranca committed Apr 4, 2013
  3. @benmcredmond

    Fixes skipping object callback filters

    This allows you to skip callbacks that are defined by objects, e.g. for
    `ActionController`:
    
        skip_after_filter MySpecialFilter
    
    Previously this didn't work due to a bug in how Rails compared callbacks
    in `Callback#matches?`. When a callback is compiled, if it's an object
    filter (i.e. not a method, proc, etc.), `Callback` now defines a method on
    `@klass` that is derived from the class name rather than `@callback_id`.
    So, when `skip_callback` tries to find the appropriate callback to
    remove, `Callback` can regenerate the method name for the filter
    object and return the correct value for `Callback#matches?`.
    benmcredmond committed Jan 2, 2013
Commits on Mar 30, 2013
  1. @vijaydev
  2. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
    	activerecord/test/cases/adapter_test.rb
    	guides/source/testing.md
    
    [ci skip]
    vijaydev committed Mar 30, 2013
  3. @vijaydev

    Revert "Using American English spellings over British style spellings"

    This reverts commit 573df1c.
    
    Reason: changelog edits aren't allowed in docrails.
    
    [ci skip]
    vijaydev committed Mar 30, 2013
Commits on Mar 27, 2013
  1. @rafaelfranca

    Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-…

    …yields-payload
    
    ActiveSupport::Notifications::Instrumenter#instrument should yield
    
    Conflicts:
    	activesupport/CHANGELOG.md
    rafaelfranca committed Mar 27, 2013
Commits on Mar 21, 2013
  1. @prathamesh-sonpatki
Commits on Mar 18, 2013
  1. @senny

    `TimeWithZone` raises `NoMethodError` in proper context.

    Closes #9772.
    
    `TimeWithZone` delegates everything to the wrapped `Time` object
    using `method_missing`. The result is that `NoMethodError` error
    will be raised in the context of `Time` which leads to a misleading
    debug output.
    senny committed Mar 18, 2013
Commits on Mar 16, 2013
  1. @steveklabnik

    Revert "Merge pull request #8156 from fredwu/acronym_fix-master"

    This reverts commit 867dc17, reversing
    changes made to 9a421aa.
    
    This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065
    
    Please see comments on #8156 for some discussion.
    steveklabnik committed Mar 16, 2013
  2. @fxn
  3. @fredwu
Commits on Mar 6, 2013
  1. @senny

    CHANGELOG entry for improved singularizing of singulars.

    Closes #9559.
    
    The actual patch was added with #4719
    senny committed Mar 6, 2013
Commits on Mar 3, 2013
  1. @stopdropandrew

    ActiveSupport::Notifications::Instrumenter#instrument should yield

    its payload the same way that ActiveSupport::Notifications does.
    Fix spelling in test name.
    stopdropandrew committed Mar 2, 2013
Commits on Feb 26, 2013
  1. @steveklabnik

    Move AS CHANGELOG entry up.

    I merged b883706 but forgot to move the entry past beta1.
    steveklabnik committed Feb 26, 2013
  2. @steveklabnik

    Merge pull request #9329 from chuckbjones/fix-cache-delete-rc

    Fix deletion of empty directories
    steveklabnik committed Feb 26, 2013
  3. @rafaelfranca

    Update CHANGELOGS

    rafaelfranca committed Feb 26, 2013
  4. @chuckbjones

    Fix deletion of empty directories:

    1. When comparing the directory to delete against the top level
       cache_path, use File.realpath to make sure we aren't comparing two
       unequal strings that point to the same path. This occurs, for
       example, when cache_path has a trailing slash, which it does in the
       default Rails configuration. Since the input to
       delete_empty_directories never has a trailing slash, the comparison
       will never be true and the top level cache directory (and above) may
       be deleted. However…
    
    2. File.delete raises EPERM when trying to delete a directory, so no
       directories have ever been deleted. Changing the code to Dir.delete
       fixes that.
    chuckbjones committed Feb 18, 2013
Commits on Feb 25, 2013
  1. @dhh

    Preparing for 4.0.0.beta1 release

    dhh committed Feb 25, 2013
  2. @chris-baynes
Commits on Feb 24, 2013
  1. @rafaelfranca
  2. @stopdropandrew
  3. @fxn
Commits on Feb 22, 2013
  1. @carlosantoniodasilva
  2. @hoffm

    Address edge case for number_to_human with units option.

    ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when
    the units hash does not contain the needed key, e.g. when the number provided is less
    than the largest key provided.
    hoffm committed Feb 20, 2013
Commits on Feb 21, 2013
  1. @gaganawhad
Commits on Feb 20, 2013
  1. @fxn
Something went wrong with that request. Please try again.