Permalink
Switch branches/tags
Commits on Jun 2, 2012
  1. Fix asset tags for files with more than one dot

    drogus committed Jun 2, 2012
    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)
Commits on Jun 1, 2012
  1. 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
  2. Merge pull request #6588 from nbibler/polymorphic_to_model

    josevalim committed Jun 1, 2012
    Correct the use of to_model in polymorphic routing
  3. 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)
  4. 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
  5. bumping to 3.2.5

    tenderlove committed Jun 1, 2012
  6. 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…

    Martin O'Connor 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
  4. Merge pull request #6553 from erichmenge/3-2-stable-json-patch

    drogus committed May 30, 2012
    3 2 stable json patch
  5. Deprecate ActiveSupport::JSON::Variable

    Erich Menge committed May 30, 2012
  6. Merge pull request #5810 from kennyj/fix_5797

    tenderlove committed with rafaelfranca May 30, 2012
    Fix #5797. Error calling dup method on AR model with serialized field
    Conflicts:
    	activerecord/lib/active_record/core.rb
  7. True, False, and Nil should be represented in as_json as themselves.

    Erich Menge committed May 30, 2012
    Conflicts:
    
    	activesupport/lib/active_support/json/encoding.rb
    	activesupport/test/json/encoding_test.rb
  8. Merge pull request #6519 from oscardelben/3-2-stable

    carlosantoniodasilva committed May 30, 2012
    Display annotations in coffee files
  9. Remove irrelevant assertion

    oscardelben committed May 29, 2012
Commits on May 29, 2012
  1. Merge pull request #6531 from freerange/3-2-stable-minitest-passthrou…

    rafaelfranca committed May 29, 2012
    …gh-exceptions
    
    Exceptions like Interrupt should not be rescued in tests.
  2. Exceptions like Interrupt should not be rescued in tests.

    floehopper committed May 29, 2012
    This is a back-port of rails/rails#6525. See the commit notes there for
    details.
Commits on May 28, 2012
  1. bumping to 3.2.4.rc1

    tenderlove committed May 28, 2012
Commits on May 27, 2012
  1. Fix railties_order when application object is passed

    drogus committed May 27, 2012
    railites_order method, introduced in 40b19e0, had a bug that was causing
    loading application instance twice in initializers if railties_order
    already included application instance. So for example
    
        railties_order = [Foo::Engine, :main_app, Bar::Engine]
    
    would result in such railties array:
    
        [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine]
    
    In order to fix it, we need to check for existence of application in
    both railties_order and railties arrays.