Commits on Mar 1, 2012
  1. @tenderlove

    bumping to 3.1.4

    tenderlove committed Mar 1, 2012
  2. @tenderlove

    Merge branch '3-1-stable-security' into 3-1-4

    * 3-1-stable-security:
      Ensure [] respects the status of the buffer.
      use AS::SafeBuffer#clone_empty for flushing the output_buffer
      add AS::SafeBuffer#clone_empty
      fix output safety issue with select options
    tenderlove committed Mar 1, 2012
  3. @josevalim @tenderlove
Commits on Feb 22, 2012
  1. @tenderlove

    updating RAILS_VERSION

    tenderlove committed Feb 22, 2012
  2. @tenderlove
  3. @tenderlove
  4. @tenderlove

    bumping up arel

    tenderlove committed Feb 21, 2012
Commits on Feb 21, 2012
  1. @tenderlove
  2. @tenderlove
  3. @tenderlove

    ruby 2.0 makes protected methods return false for respond_to, so pass…

    … true as the second param
    tenderlove committed Feb 21, 2012
  4. @tenderlove

    Merge pull request #5096 from lawso017/master

    Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
    Conflicts:
    
    	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
    	activerecord/test/cases/adapters/postgresql/schema_test.rb
    tenderlove committed Feb 20, 2012
  5. @amatsuda @tenderlove
  6. @amatsuda @tenderlove

    add AS::SafeBuffer#clone_empty

    amatsuda committed with tenderlove Feb 13, 2012
Commits on Feb 20, 2012
  1. @lest @tenderlove
  2. @tenderlove
  3. @pixeltrix

    Remove fixture files with Windows incompatible filenames

    Windows doesn't allow `\ / : * ? " < > |` in filenames so create
    the fixture files at runtime and ignore the incompatible ones when
    running on Windows.
    pixeltrix committed Feb 20, 2012
Commits on Feb 18, 2012
  1. @josevalim

    Merge pull request #5079 from arunagw/fix_assets_test

    Fix assets test
    josevalim committed Feb 18, 2012
  2. @arunagw

    fixed assets test

    arunagw committed Feb 18, 2012
Commits on Feb 17, 2012
  1. @pixeltrix

    Simplify regexp

    pixeltrix committed Feb 17, 2012
  2. @pixeltrix

    Fix ActionDispatch::Static to serve files with unencoded PCHAR

    RFC 3986[1] allows sub-delim characters in path segments unencoded,
    however Rack::File requires them to be encoded so we use URI's
    unescape method to leave them alone and then escape them again.
    
    Also since the path gets passed to Dir[] we need to escape any glob
    characters in the path.
    
    [1]: http://www.ietf.org/rfc/rfc3986.txt
    pixeltrix committed Feb 17, 2012
  3. @spastorino

    Merge pull request #5072 from arunagw/fix_failing_test_ruby187_p358_3…

    …1stable
    
    Fix failing test ruby187 p358 31stable
    spastorino committed Feb 17, 2012
  4. @arunagw
Commits on Jan 31, 2012
  1. @jonleighton

    Merge pull request #4787 from kennyj/fix_4754-2

    [Backport][3-1-stable] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
    jonleighton committed Jan 31, 2012
  2. @kennyj

    Fix GH #4754. Remove double-quote characters around PK when using sql…

    …_mode=ANSI_QUOTES
    kennyj committed Jan 31, 2012
Commits on Jan 24, 2012
  1. @tenderlove

    Merge pull request #4514 from brainopia/update_timezone_offets

    Update time zone offset information
    tenderlove committed Jan 24, 2012
Commits on Jan 23, 2012
  1. @pkondzior @drogus

    Fix ActiveModel::Errors#dup

    Since ActiveModel::Errors instance keeps all error messages as hash
    we should duplicate this object as well.
    
    Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash,
    which results in different behavior on dup, this may result in regression for
    people relying on it.
    
    Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this
    regression we need to backport #initialize_dup.
    pkondzior committed with drogus Jan 16, 2012
  2. @drogus
Commits on Jan 21, 2012
  1. @vijaydev

    Merge pull request #4579 from guilleiguaran/add-js-runtime-to-gemfile

    Add therubyracer gem commented in default Gemfile (3.1.x)
    vijaydev committed Jan 21, 2012
  2. @guilleiguaran
Commits on Jan 16, 2012
  1. @guilleiguaran @vijaydev
Commits on Jan 13, 2012
  1. @josevalim

    No AS::TestCase here.

    josevalim committed Jan 13, 2012
  2. @josevalim
  3. @vijaydev

    Merge pull request #4442 from guilleiguaran/3-1-changelogs

    Update actionpack changelog in 3-1-stable
    vijaydev committed Jan 12, 2012
  4. @guilleiguaran
Commits on Jan 12, 2012
  1. @vijaydev