Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: extensions-fix
Commits on Jun 2, 2012
  1. Fix asset tags for files with more than one dot

    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)
Commits on Jun 1, 2012
  1. Allow to use mounted helpers in ActionView::TestCase

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

    Merge pull request #6588 from nbibler/polymorphic_to_model

    josevalim authored
    Correct the use of to_model in polymorphic routing
  3. @nbibler
  4. @rafaelfranca
  5. Include routes.mounted_helpers into integration tests

    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)
  6. @rafaelfranca

    Merge pull request #6587 from amatsuda/controller_generator_remove_bl…

    rafaelfranca authored
    …ank_line_32
    
    Backporting #6586 patch to 3-2-stable
  7. @amatsuda
  8. @tenderlove

    bumping to 3.2.5

    tenderlove authored
  9. @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:
    13f1401
    8491740
    dffbb52
    
    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
  2. @tenderlove

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

    tenderlove authored
    * 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. @tenderlove

    bumping to 3.2.4

    tenderlove authored
  4. @tenderlove
  5. @tenderlove

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

    tenderlove authored
    * 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
  6. @tenderlove

    updating changelogs

    tenderlove authored
  7. @rafaelfranca

    Merge pull request #6562 from martinoconnor/generator-fix-stable

    rafaelfranca authored
    3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
  8. @martinoconnor

    Changed symbol platform to platforms for the commented out call to ge…

    martinoconnor authored
    …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.
  9. @tenderlove

    Merge pull request #6558 from parndt/fix_regression

    tenderlove authored
    Fix regression
  10. @tenderlove

    Merge pull request #6558 from parndt/fix_regression

    tenderlove authored
    Fix regression
  11. @parndt

    Revert "Removes unneeded caching from ActiveRecord::Base.relation"

    parndt authored
    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. @tenderlove

    Strip [nil] from parameters hash.

    tenderlove authored
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
  2. @tenderlove

    predicate builder should not recurse for determining where columns.

    tenderlove authored
    Thanks to Ben Murphy for reporting this
    
    CVE-2012-2661
  3. @rafaelfranca

    Merge pull request #6477 from steveklabnik/close_discovered_pg_connec…

    rafaelfranca authored
    …tion
    
    Properly discover a connection is closed in postgresql_adapter
  4. Merge pull request #6553 from erichmenge/3-2-stable-json-patch

    authored
    3 2 stable json patch
  5. Deprecate ActiveSupport::JSON::Variable

    Erich Menge authored
  6. @tenderlove @rafaelfranca

    Merge pull request #5810 from kennyj/fix_5797

    tenderlove authored rafaelfranca committed
    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 authored
    Conflicts:
    
    	activesupport/lib/active_support/json/encoding.rb
    	activesupport/test/json/encoding_test.rb
  8. @carlosantoniodasilva

    Merge pull request #6519 from oscardelben/3-2-stable

    carlosantoniodasilva authored
    Display annotations in coffee files
  9. @oscardelben
Commits on May 29, 2012
  1. @rafaelfranca

    Merge pull request #6531 from freerange/3-2-stable-minitest-passthrou…

    rafaelfranca authored
    …gh-exceptions
    
    Exceptions like Interrupt should not be rescued in tests.
  2. @floehopper

    Exceptions like Interrupt should not be rescued in tests.

    floehopper authored
    This is a back-port of rails/rails#6525. See the commit notes there for
    details.
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.2.4.rc1

    tenderlove authored
  2. @bkzl @oscardelben

    Display annotations from .coffee files in `rake notes`

    bkzl authored oscardelben committed
Commits on May 27, 2012
  1. Fix railties_order when application object is passed

    authored
    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.
Something went wrong with that request. Please try again.