Permalink
Commits on Jun 7, 2012
  1. Revert "Perf: Don't load the association for #delete_all."

    jonleighton committed Jun 7, 2012
    This reverts commit b98d1e2.
    
    Closes #6609
    
    Conflicts:
    
    	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
Commits on Jun 6, 2012
  1. Merge pull request #6642 from kuroda/3-2-activemodel-translation-patch

    josevalim committed Jun 6, 2012
    Fix human attribute_name to handle deeply nested attributes
  2. Fix human attribute_name to handle deeply nested attributes

    kuroda committed Jun 6, 2012
    This is a back-port of b0e2fc8 to Rails 3.2.
    See #5843 and #3859 also.
Commits on Jun 5, 2012
  1. Revert "fix the Flash middleware loading the session on every request…

    rafaelfranca committed Jun 5, 2012
    … (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called"
    
    This reverts commits e3069c6 and 2b2983d.
    
    Reason: This add a non-backward compatible change in the way that flash
    works now (swept in every request).
  2. Add test to flash sweep after two redirects

    rafaelfranca committed Jun 3, 2012
    This test is needed to avoid regressions in the way that flash works
    now (swept in every request).
  3. Merge pull request #6613 from carlosgaldino/3-2-data-confirm

    rafaelfranca committed Jun 5, 2012
    Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option
  4. Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op…

    carlosgaldino committed Jun 1, 2012
    …tion
    
    This deprecation applies to:
    `button_to`
    `button_tag`
    `image_submit_tag`
    `link_to`
    `submit_tag`
    
    As :confirm is an UI specific option is better to use the data attributes,
    teaching users about unobtrusive JavaScript and how Rails works with it.
Commits on Jun 4, 2012
  1. Merge pull request #6622 from kennyj/fix_6591-32

    rafaelfranca committed Jun 4, 2012
    [3-2-stable back ported] Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes
Commits on Jun 1, 2012
  1. Merge pull request #6593 from yahonda/skip_test_remove_column_with_ar…

    rafaelfranca committed Jun 1, 2012
    …ray_as_an_argument_is_deprecated
    
    Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle
  2. Allow to use mounted helpers in ActionView::TestCase

    drogus committed Jun 1, 2012
    Similarly to 6525002, this allows to use routes helpers for mounted
    helpers, but this time in ActionView::TestCase
  3. Skip test_remove_column_with_array_as_an_argument_is_deprecated with …

    yahonda committed Jun 1, 2012
    …Oracle adapter.
    
    Because Oracle adapter supports only remove_column :table_name, :column_name syntax
    and it has never supported remove_column :table_name, [:column_name].
  4. Merge pull request #6588 from nbibler/polymorphic_to_model

    josevalim committed Jun 1, 2012
    Correct the use of to_model in polymorphic routing
  5. Include routes.mounted_helpers into integration tests

    drogus committed Jun 1, 2012
    In integration tests, you might want to use helpers from engines that
    you mounted in your application. It's not hard to add it by yourself,
    but it's unneeded boilerplate. mounted_helpers are now included by
    default. That means that given engine mounted like:
    
        mount Foo::Engine => "/foo", :as => "foo"
    
    you will be able to use paths from this engine in tests this way:
    
        foo.root_path #=> "/foo"
    
    (closes #6573)
  6. Merge pull request #6587 from amatsuda/controller_generator_remove_bl…

    rafaelfranca committed Jun 1, 2012
    …ank_line_32
    
    Backporting #6586 patch to 3-2-stable
  7. bumping to 3.2.5

    tenderlove committed Jun 1, 2012
  8. Restore behavior of Active Record 3.2.3 scopes

    pixeltrix committed Jun 1, 2012
    A series of commits relating to preloading and scopes caused a regression.
    Cloning the relation calls initialize_copy which resets a number of instance
    variables to nil. Without this the scope thinks that it is already loaded
    when it is called again.
    
    Reverts the following commits:
    13f1401
    8491740
    dffbb52
    
    Fixes #6575, #6576 & #6577
Commits on May 31, 2012
  1. Merge branch '3-2-rel' into 3-2-stable

    tenderlove committed May 31, 2012
    * 3-2-rel:
      bumping to 3.2.4
      adding security notifications to CHANGELOGs
      updating changelogs
      Merge pull request #6558 from parndt/fix_regression
  2. Merge branch '3-2-stable-sec' into 3-2-stable

    tenderlove committed May 31, 2012
    * 3-2-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
      bumping to 3.2.4.rc1
  3. bumping to 3.2.4

    tenderlove committed May 31, 2012
  4. Merge branch '3-2-stable-sec' into 3-2-rel

    tenderlove committed May 31, 2012
    * 3-2-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
  5. updating changelogs

    tenderlove committed May 31, 2012
  6. Merge pull request #6562 from martinoconnor/generator-fix-stable

    rafaelfranca committed May 31, 2012
    3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
  7. Changed symbol platform to platforms for the commented out call to ge…

    martinoconnor committed May 31, 2012
    …m 'therubyracer'.
    
    Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
    Updating tests.
  8. Merge pull request #6558 from parndt/fix_regression

    tenderlove committed May 31, 2012
    Fix regression
  9. Merge pull request #6558 from parndt/fix_regression

    tenderlove committed May 31, 2012
    Fix regression
  10. Revert "Removes unneeded caching from ActiveRecord::Base.relation"

    parndt committed May 31, 2012
    This reverts commit ebfa58a.
    
    This change caused a regression in my application's tests:
    
    * Failing build http://travis-ci.org/#!/resolve/refinerycms/builds/1461242
    
    Broken tests pass after this change is reverted.
Commits on May 30, 2012
  1. Strip [nil] from parameters hash.

    tenderlove committed May 30, 2012
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
  2. predicate builder should not recurse for determining where columns.

    tenderlove committed May 30, 2012
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661
  3. Merge pull request #6477 from steveklabnik/close_discovered_pg_connec…

    rafaelfranca committed May 30, 2012
    …tion
    
    Properly discover a connection is closed in postgresql_adapter