Permalink
Commits on Jul 21, 2011
Commits on Jul 20, 2011
  1. no need to sort the values

    tenderlove committed Jul 20, 2011
  2. assign_nested_attributes_for_collection_association should work with …

    franckverrot committed with tenderlove Jul 19, 2011
    …Ruby 1.9 [Closes #2106]
    
    Children attributes can be either String's or Symbol's, so let's check if the object responds to to_i.
  3. this fixes a brittle test in fixtures_test.rb which fails when you ar…

    joshk committed with fxn Jul 19, 2011
    …e in a timezone which is ahead of UTC but UTC is in the previous day still.
Commits on Jul 19, 2011
  1. Merge pull request #2156 from vijaydev/changelogs31

    spastorino committed Jul 19, 2011
    Adding changelog entry for submit helper change (3-1-stable)
  2. Merge pull request #2157 from vijaydev/3-1-stable

    fxn committed Jul 19, 2011
    Avoid Symbol#to_proc (3-1-stable)
  3. avoid Symbol#to_proc

    vijaydev committed Jul 19, 2011
  4. Merge pull request #2147 from norman/3-1-stable

    spastorino committed Jul 19, 2011
    Explicitly require Active Support dependencies (3-1-stable)
  5. Explicitly require Active Support dependencies

    norman committed Jul 19, 2011
    This fixes errors when using Active Record outside of Rails. In Rails,
    these files are required by other classes that are always loaded, so
    this error does not happen.
    
    Without core_ext/module/delegation, a NoMethodError is raised because
    `delegate` remains undefined.
    
    Without core_ext/class/attribute_acessors, an ArgumentError is raised because
    `delegate` does not receive a value for its :to option.
  6. Merge pull request #2140 from mcmire/issue_2078_3-1-stable

    spastorino committed Jul 19, 2011
    Fix for #2078 (against 3-1-stable)
Commits on Jul 18, 2011
  1. Added a .travis.yml config and travis specific ci script.

    joshk committed with fxn Jul 15, 2011
    Don't install ruby-debug if running the test suite on Travis,
    linecache19 is the main offender, very very slow.
    
    And do not install pg if Travis is bundling the gems, pg will be setup
    on Travis soon.
  2. This fixes an issue when bundling to a local path (eg. /vendor/bundle).

    joshk committed with fxn Jul 17, 2011
    If you bundle to a local path bundler is not included in it, so
    calling "gem 'bundler'" will fail.
    
    Conflicts:
    
    	load_paths.rb
  3. ActiveRecord: Fix eager loading so that giving a blank order clause g…

    mcmire committed Jul 18, 2011
    …enerates valid SQL
  4. Merge pull request #2135 from jstorimer/ensure-status-codes-are-logge…

    spastorino committed Jul 18, 2011
    …d-properly-3-1-stable
    
    Ensure status codes are logged properly (3-1-stable)
  5. Ensure that status codes are logged properly

    jstorimer committed Jul 18, 2011
    Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
    so that status codes rendered from rescue_from blocks are logged
    properly.
  6. Merge pull request #2121 from arunagw/3-1-plugin_new_gen_test

    josevalim committed Jul 18, 2011
    3 1 plugin new gen test
  7. Merge pull request #2129 from sikachu/3-1-stable-dynamic_finder

    jonleighton committed Jul 18, 2011
    Show a deprecation warning if user passing less number of argument in the
Commits on Jul 17, 2011
  1. Show a deprecation warning if user passing less number of argument in…

    sikachu committed Jul 17, 2011
    … the dynamic finder
    
    The previous behavior was unintentional, and some people was relying on it. In the next version of Rails, the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.) It will raise the ArgumentError otherwise.
  2. Don't do remove_possible_method when delegate is used. Two reasons: 1…

    jonleighton committed Jul 17, 2011
    …) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937.
  3. Merge pull request #2048 from sikachu/3-1-stable-test_fix

    spastorino committed Jul 17, 2011
    Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a
  4. Fix a wrong assertion on url_helper_test, and refactor `html_safe` te…

    sikachu committed Jul 12, 2011
    …st to be in its method
Commits on Jul 16, 2011
  1. synchronizes assets.rake with master

    fxn committed Jul 16, 2011
  2. Merge pull request #2103 from loz/3-1-stable

    spastorino committed Jul 16, 2011
    Added gem helper tasks to Rakefile for engine plugins.
  3. Added gem helper tasks to Rakefile for engine plugins. It makes sense…

    Jonathan Lozinski committed Jul 16, 2011
    … for this to be there given they're being generated to be gemified.
    
    Altered addition to Rakefile so that it won't add GemHelper if the user specified --skip-gemspec