Permalink
Switch branches/tags
Commits on Jul 20, 2011
  1. Merge pull request #2146 from dmathieu/blank_binary_encoding

    fxn committed Jul 20, 2011
    fix String#blank? on binary strings
Commits on Jul 19, 2011
  1. Merge pull request #2160 from joshk/patch-5

    jeremy committed Jul 19, 2011
    Changed the year of a date used in a test which fails when using 1.8.7
  2. Changed the year of a date used in a test which fails when using 1.8.…

    joshk committed Jul 19, 2011
    …7 on a 32bit machine (ArgumentError: time out of range)
  3. Merge pull request #2155 from vijaydev/changelogs

    spastorino committed Jul 19, 2011
    Adding changelog entry for submit helper change which removed object_name_id generation
  4. Merge pull request #2154 from vijaydev/better_map

    spastorino committed Jul 19, 2011
    Avoid Symbol#to_proc
  5. avoid Symbol#to_proc

    vijaydev committed Jul 19, 2011
  6. Merge pull request #2148 from norman/master

    spastorino committed Jul 19, 2011
    Explicitly require Active Support dependencies (master)
  7. 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.
  8. Merge pull request #2139 from mcmire/issue_2078_master

    spastorino committed Jul 19, 2011
    Fix for #2078 (against master)
Commits on Jul 18, 2011
  1. Merge pull request #2141 from joshk/master

    fxn committed Jul 18, 2011
    Config files to get Rails on Travis-CI
  2. Merge pull request #2133 from jstorimer/ensure-status-codes-are-logge…

    josevalim committed Jul 18, 2011
    …d-properly
    
    Ensure that status codes are logged properly
  3. 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.
  4. Merge pull request #2116 from guilleiguaran/fix-environment-generator…

    spastorino committed Jul 18, 2011
    …-action
    
    Fix Rails::Generators::Actions#environment when env is passed
  5. Merge pull request #195 from bigfix/active_model_include_serialization

    josevalim committed Jul 18, 2011
    ActiveModel support for the :include serialization option
  6. Merge pull request #2075 from lawrencepit/match_attribute_method

    josevalim committed Jul 18, 2011
    Optimization of ActiveModel's match_attribute_method?
  7. Merge pull request #2128 from sikachu/master-dynamic_finder

    jonleighton committed Jul 18, 2011
    Raise an ArgumentError if user passing less number of argument in the dynamic finder
  8. Merge pull request #2124 from arunagw/render_partial_invalid_check_fix

    spastorino committed Jul 18, 2011
    Checking with to_s. As regexp fail with 1.8.7
Commits on Jul 17, 2011
  1. 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.
  2. Raise an ArgumentError if user passing less number of argument in the…

    sikachu committed Jul 17, 2011
    … dynamic finder
    
    The previous behavior was unintentional, and some people was relying on it. Now the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.)
    
    So if you were doing this and expecting the second argument to be nil:
    
        User.find_by_username_and_group("sikachu")
    
    You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this:
    
        User.find_by_username_and_group("sikachu", nil)
  3. Merge pull request #2046 from sikachu/master-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
  5. Merge pull request #2018 from bhus/render_partial_invalid_check

    spastorino committed Jul 17, 2011
    Render partial invalid check
  6. Revert "Fix failure in test_preserves_existing_fixture_data from test…

    jonleighton committed Jul 17, 2011
    …/cases/fixtures_test.rb when UTC and local time occur on different dates." I am pretty sure this was an incorrect fix, and it still failed in certain circumstances anyway. I am now unable to reproduce the original failure I was experiencing so will leave it for now and see if this pops up again.
    
    This reverts commit e4479b2.
  7. ActiveModel support for the :include serialization option

    John Firebaugh
    John Firebaugh committed Feb 22, 2011
    This commit moves support for the :include serialization option for
    serializing associated objects out of ActiveRecord in into ActiveModel.
    The following methods support the :include option:
    
      * serializable_hash
      * to_json
      * to_xml
    
    Instances must respond to methods named by the values of the :includes
    array (or keys of the :includes hash). If an association method returns
    an object that is_a?(Enumerable) (which AR has_many associations do), it
    is assumed to be a collection association, and its elements must respond
    to :serializable_hash. Otherwise it must respond to :serializable_hash
    itself.
    
    While here, fix #858, XmlSerializer should not singularize already
    singular association names.
  8. Move to_xml tests to xml_serialization_test.rb

    John Firebaugh
    John Firebaugh committed Feb 22, 2011
    One duplicate was eliminated: test_to_xml_including_methods/
    test_methods_are_called_on_object.
  9. We already have the record; no need to retrieve it again

    John Firebaugh
    John Firebaugh committed Feb 22, 2011