Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 25, 2011
  1. @tenderlove

    bumping to rc5

    tenderlove authored
  2. @tenderlove

    bumping up arel version

    tenderlove authored
  3. @fxn

    Fixed Typo

    John authored fxn committed
  4. @thedarkone
Commits on Jul 24, 2011
  1. @oem @fxn

    Changed a few instances of of words in the API docs written in Britis…

    oem authored fxn committed
    …h English to
    
    American English(according to Weber)
    
    Conflicts:
    
    	actionpack/lib/action_controller/metal/request_forgery_protection.rb
    	railties/lib/rails/engine.rb
Commits on Jul 23, 2011
  1. @spastorino

    Revert "Merge pull request #2194 from cldwalker/after_initialize"

    spastorino authored
    This reverts commit 1983007, reversing
    changes made to ae65c0b.
  2. @spastorino

    Merge pull request #2194 from cldwalker/after_initialize

    spastorino authored
    Fix after_initialize and Base.create edge case
  3. @spastorino

    Merge pull request #2172 from arunagw/database-rake-1.9.2_3-1-stable

    spastorino authored
    Database rake 1.9.2 3 1 stable
  4. @vijaydev @fxn

    use simpler words in docs

    vijaydev authored fxn committed
  5. @cldwalker
  6. @hmcfletch @cldwalker

    fix after_initialize edge case (close #2074 and close #2175)

    hmcfletch authored cldwalker committed
    fix behavior when after_initialize is defined and a block is passed to Base.create
Commits on Jul 22, 2011
  1. @tenderlove
Commits on Jul 21, 2011
  1. @arunagw

    This conditions is required to work with database create task. 1.9.2 …

    arunagw authored
    …is having a bug with "Calling return within begin still executes else".
Commits on Jul 20, 2011
  1. @tenderlove

    no need to sort the values

    tenderlove authored
  2. @franckverrot @tenderlove

    assign_nested_attributes_for_collection_association should work with …

    franckverrot authored tenderlove committed
    …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. @tenderlove
  4. @joshk @fxn

    this fixes a brittle test in fixtures_test.rb which fails when you ar…

    joshk authored fxn committed
    …e in a timezone which is ahead of UTC but UTC is in the previous day still.
Commits on Jul 19, 2011
  1. @vijaydev

    avoid Symbol#to_proc

    vijaydev authored
  2. @norman

    Explicitly require Active Support dependencies

    norman authored
    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.
Commits on Jul 18, 2011
  1. @mcmire
  2. @jonleighton
  3. @sikachu
Commits on Jul 17, 2011
  1. @sikachu

    Show a deprecation warning if user passing less number of argument in…

    sikachu authored
    … 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.
Commits on Jul 16, 2011
  1. @jonleighton
  2. @elight

    Closes #2065

    elight authored
    Cache key was incorrectly using timezone-dependent record#updated_at when it should be using a timezone-independent value to generate the cache key
Commits on Jul 12, 2011
  1. @spastorino

    Merge pull request #2040 from SAP-Oxygen/3-1-stable-sqlbypass-patch

    spastorino authored
    Fix for SqlBypass session store
  2. @jhtwong

    Fix for SqlBypass session store

    jhtwong authored
    Two issues fixed:
    1) connection_pool is not defined - needed by SessionStore#drop_table!
    and create_table! since c94651f
    
    2) initialization of connection to the default of AR::Base.connection
    only occurred at the singleton level - the instance level method defined
    by cattr_accessor did not have this logic
  3. @jhtwong

    Fixed session ID fixation for ActiveRecord::SessionStore

    jhtwong authored
    I have found that Rails will take an invalid session ID specified by the
    client and materialize a session based on that session ID. This means
    that it is possible, among other things, for a client to use an
    arbitrarily weak session ID or for a client to resurrect a previous used
    session ID. In other words, we cannot guarantee that all session IDs are
    generated by the server and that they are (statistically) unique through
    time.
    
    The fix is to always generate a new session ID in #get_session if an
    existing session cannot be found under the incoming session ID.
    
    Also added new tests that make sure that an invalid session ID is never
    materialized into a new session, regardless of whether it comes in via a
    cookie or a URL parameter (when :cookie_only => false).
Commits on Jul 11, 2011
  1. @jonleighton

    Fix exception if old and new targets are both nil. Fixes #1471.

    jonleighton authored
    Conflicts:
    
    	activerecord/test/models/comment.rb
Commits on Jul 9, 2011
  1. @spastorino
  2. @amatsuda

    formats

    amatsuda authored
  3. @amatsuda

    fix AR having() not to raise NoMethodError when the given argument do…

    amatsuda authored
    …es not respond to empty?
    
    having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs
  4. @jonleighton
  5. @amatsuda @fxn

    find(:first) => first

    amatsuda authored fxn committed
Commits on Jul 8, 2011
  1. @jonleighton

    Destroy association habtm record before destroying the record itself.…

    Tomas D'Stefano authored jonleighton committed
    … Fixes issue #402.
Something went wrong with that request. Please try again.