Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Jun 10, 2012
Commits on Jun 9, 2012
  1. @josevalim

    Merge pull request #6687 from tiegz/3-2-optimizations

    josevalim authored
    ActiveRecord#attributes optimization: minimize objects created
  2. @pixeltrix

    Merge pull request #6689 from arunagw/duplicate_test_removed

    pixeltrix authored
    Duplicate test removed
  3. @arunagw

    Duplicate tests removed.

    arunagw authored
  4. @tiegz
Commits on Jun 8, 2012
  1. @drogus
  2. @rafaelfranca
  3. @rafaelfranca

    Merge pull request #6677 from arunagw/3-2-stable

    rafaelfranca authored
    Removed protected as we already doing it above.
  4. @arunagw

    We should not include engine.rake file into rake

    arunagw authored
    if we are passing -T which is skip_test_unit
    See issue #6673 for more details.
    I saw that we are not creating dummy app even if 
    we do skip_test_unit. 
    Fixes #6673
  5. @arunagw
Commits on Jun 7, 2012
  1. @drogus

    Fix railties test suite

    drogus authored
    Apparently asset_environment should not be invoked if it's not needed.
    This fixes broken build by getting back to the code more similar to the
    version changed here: 5b0a891
  2. @drogus

    Fix asset tags for files with more than one dot

    drogus authored
    After the fix done in 39f9f02, there are cases that will not work
    correctly. If you have file with "2 extensions", like foo.min.js and you
    reference the file without extension, like:
        javascript_include_tag "foo.min"
    it will fail because sprockets finds foo.min.js with foo.min argument.
    This commit fixes this case and will get the right file even when
    referrencing it without extension.
    (closes #6598)
  3. @jonleighton
  4. @jonleighton

    Revert "Perf: Don't load the association for #delete_all."

    jonleighton authored
    This reverts commit b98d1e2.
    Closes #6609
Commits on Jun 6, 2012
  1. @josevalim

    Merge pull request #6642 from kuroda/3-2-activemodel-translation-patch

    josevalim authored
    Fix human attribute_name to handle deeply nested attributes
  2. @kuroda

    Fix human attribute_name to handle deeply nested attributes

    kuroda authored
    This is a back-port of b0e2fc8 to Rails 3.2.
    See #5843 and #3859 also.
Commits on Jun 5, 2012
  1. @rafaelfranca

    Revert "fix the Flash middleware loading the session on every request…

    rafaelfranca authored
    … (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. @rafaelfranca

    Add test to flash sweep after two redirects

    rafaelfranca authored
    This test is needed to avoid regressions in the way that flash works
    now (swept in every request).
  3. @rafaelfranca

    Merge pull request #6613 from carlosgaldino/3-2-data-confirm

    rafaelfranca authored
    Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option
  4. @carlosgaldino

    Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op…

    carlosgaldino authored
    This deprecation applies to:
    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. @rafaelfranca

    Merge pull request #6622 from kennyj/fix_6591-32

    rafaelfranca authored
    [3-2-stable back ported] Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes
  2. @kennyj
  3. @earnold @kennyj

    Add failing test for 3.2.5 datetime attribute regression

    earnold authored kennyj committed
Commits on Jun 1, 2012
  1. @rafaelfranca

    Merge pull request #6593 from yahonda/skip_test_remove_column_with_ar…

    rafaelfranca authored
    Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle
  2. @drogus

    Allow to use mounted helpers in ActionView::TestCase

    drogus authored
    Similarly to 6525002, this allows to use routes helpers for mounted
    helpers, but this time in ActionView::TestCase
  3. @yahonda

    Skip test_remove_column_with_array_as_an_argument_is_deprecated with …

    yahonda authored
    …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. @josevalim

    Merge pull request #6588 from nbibler/polymorphic_to_model

    josevalim authored
    Correct the use of to_model in polymorphic routing
  5. @nbibler
  6. @rafaelfranca
  7. @drogus

    Include routes.mounted_helpers into integration tests

    drogus authored
    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)
  8. @rafaelfranca

    Merge pull request #6587 from amatsuda/controller_generator_remove_bl…

    rafaelfranca authored
    Backporting #6586 patch to 3-2-stable
  9. @amatsuda
  10. @tenderlove

    bumping to 3.2.5

    tenderlove authored
  11. @pixeltrix

    Restore behavior of Active Record 3.2.3 scopes

    pixeltrix authored
    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:
    Fixes #6575, #6576 & #6577
Commits on May 31, 2012
  1. @tenderlove

    Merge branch '3-2-rel' into 3-2-stable

    tenderlove authored
    * 3-2-rel:
      bumping to 3.2.4
      adding security notifications to CHANGELOGs
      updating changelogs
      Merge pull request #6558 from parndt/fix_regression
Something went wrong with that request. Please try again.