Permalink
Commits on Nov 12, 2012
  1. Bump to 3.2.9

    spastorino committed Nov 12, 2012
Commits on Nov 9, 2012
  1. Revert "Add test case to assets eager load"

    spastorino committed Nov 9, 2012
    This reverts commit 552a3e1.
  2. Bump up to 3.2.9.rc3

    spastorino committed Nov 9, 2012
  3. Merge pull request #8161 from guilleiguaran/downgrade-sprockets

    rafaelfranca committed with spastorino Nov 9, 2012
    Lock sprockets to 2.2.x
    
    REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release.
    
    In a next release we can relax the dependency again.
    
    See #8099 for more information.
  4. Revert "Respect children paths filter settings"

    spastorino committed Nov 9, 2012
    This reverts commit 53778ec.
    Closes #8146
Commits on Nov 2, 2012
  1. Revert "Merge pull request #7668 from Draiken/fix_issue_6497"

    rafaelfranca committed Nov 2, 2012
    This reverts commit 61d5d2d.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    REASON: This added a backward incompatible change.
Commits on Nov 1, 2012
  1. Bump to 3.2.9.rc2

    spastorino committed Nov 1, 2012
  2. Fix issue with collection associations and first(n)/last(n)

    carlosantoniodasilva committed Nov 1, 2012
    When calling first(n) or last(n) in a collection, Active Record was
    improperly trying to set the inverse of instance in case that option
    existed. This change was introduced by
    fdf4eae.
    
    In such cases we don't need to do that "manually", since the way
    collection will be loaded will already handle that, so we just skip
    setting the inverse association when any argument is given to
    first(n)/last(n).
    
    The test included ensures that these scenarios will have the inverse of
    instance set properly.
    
    Fixes #8087, Closes #8094.
Commits on Oct 31, 2012
  1. relaxes assertion

    fxn committed Oct 31, 2012
    This method returns the status of the operation,
    but as we generally do in the code base it does
    not commit to any particular exact value. Hence,
    we do not have to check for a singleton, because
    if the implementation changes and returns some
    other true value the test should pass.
  2. Merge pull request #8083 from saks/fix_update_column_return_value

    josevalim committed Oct 31, 2012
    Fix ActiveRecord#update_column return value
  3. Revert "Merge pull request #7659 from HugoLnx/template_error_no_match…

    rafaelfranca committed Oct 31, 2012
    …es_rebased"
    
    This reverts commit 7d17cd2.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Reason: This added a regression since people were relying on this buggy behavior.
    This will introduce back #3849 but we will be backward compatible in
    stable release.
    
    Fixes #8068.
  4. Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_asse…

    rafaelfranca committed Oct 31, 2012
    …rtion_variables"
    
    This reverts commit 2bad605.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Reason: This added a regression related with shoulda-matchers, since it
    is expecting the instance variable @layouts
    
    See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74
    
    This will introduce back #7459 but this stable release will be backward compatible.
    Related with #8068.
Commits on Oct 30, 2012
  1. Add CHANGELOG entry to #8032 fix

    rafaelfranca committed Oct 30, 2012
    e6b4184 fixes that issue too.
    
    [ci skip]
  2. Fix typo 💣 [ci skip]

    rafaelfranca committed Oct 30, 2012
  3. Fix bug when Column is trying to type cast boolean values to integer.

    rafaelfranca committed Oct 30, 2012
    This can occur if the user is using :integer columns to store boolean
    values. Now we are handling the boolean values but it still raises if
    the value can't type cast to integer and is not a boolean. See #7509.
    
    Fixes #8067.
Commits on Oct 29, 2012
  1. Merge pull request #8009 from graceliu/3-2-fix_database_url_support

    rafaelfranca committed Oct 29, 2012
    fixed support for DATABASE_URL for rake db tasks
  2. fixed support for DATABASE_URL for rake db tasks

    graceliu committed with rafaelfranca Oct 12, 2012
    Backport for #7521
    
    - added tests to confirm establish_connection uses DATABASE_URL and
      Rails.env correctly even when no arguments are passed in.
    - updated rake db tasks to support DATABASE_URL, and added tests to
      confirm correct behavior for these rake tasks.  (Removed
      establish_connection call from some tasks since in those cases
      the :environment task already made sure the function would be called)
    - updated Resolver so that when it resolves the database url, it
      removes hash values with empty strings from the config spec (e.g.
      to support connection to postgresql when no username is specified).
    - updated ResolverTest to use current_adapter? to check the type of
      the current adapter.
  3. Bump to 3.2.9.rc1

    spastorino committed Oct 29, 2012
  4. Add 3.2.9 section in ARes CHANGELOG

    spastorino committed Oct 29, 2012
    [ci skip]
  5. Revert "Deprecate Paths::Path#children which is unused now"

    rafaelfranca committed Oct 29, 2012
    This reverts commit f7de647.
    
    We can't deprecate things in stable branches. I didn't not realized that
    the pull request was for 3-2-stable
  6. Merge pull request #7587 from elia/fix-too-eager-loading

    rafaelfranca committed Oct 29, 2012
    Should not eager_load app/assets
  7. Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg

    rafaelfranca committed Oct 29, 2012
    SQLite3Adapter#type_cast should not mutate arguments
    Conflicts:
    	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
  8. Merge pull request #8053 from henrik/update_columns_with_primary_key

    carlosantoniodasilva committed with rafaelfranca Oct 28, 2012
    Unbreak update_column/update_columns for the primary key attribute.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/persistence.rb
    	activerecord/test/cases/persistence_test.rb
  9. Make Active Record tests pass in isolation

    rafaelfranca committed Oct 29, 2012
    Also remove the feature detecting for Ruby 1.9
  10. Fix the skip code.

    rafaelfranca committed Oct 29, 2012
    Checking for the constant doesn't work
  11. Merge pull request #7593 from veader/patch-1

    rafaelfranca committed Oct 26, 2012
    Decode attributes pulled from URI.parse
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/connection_adapters/connection_specification.rb
Commits on Oct 28, 2012
  1. Merge pull request #8048 from senny/7761_dont_render_view_without_mai…

    rafaelfranca committed Oct 28, 2012
    …l_call
    
    Do not render views when mail() isn't called. (NullMail refactoring)
    Conflicts:
    	actionmailer/CHANGELOG.md
  2. Merge pull request #8047 from arunagw/json_only_in_18

    carlosantoniodasilva committed Oct 28, 2012
    Removing JSON for other ruby
  3. Removing JSON for other ruby

    arunagw committed Oct 28, 2012
    It's only required for 1.8 and for JRuby!
    I was fixing a bug with JSON pure on 1.8.7
    and I found that we have included json for other
    1.8 > rubies also.
Commits on Oct 27, 2012
  1. Respect children paths filter settings

    elia committed Oct 27, 2012
    E.g. don't eager-load app/assets even if app/* has the eager_load flag set.