Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 1, 2012
  1. @tenderlove

    bumping to 3.1.4

    tenderlove authored
  2. @tenderlove

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

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

    Ensure [] respects the status of the buffer.

    josevalim authored tenderlove committed
Commits on Feb 22, 2012
  1. @tenderlove

    updating RAILS_VERSION

    tenderlove authored
  2. @tenderlove
  3. @tenderlove
  4. @tenderlove

    bumping up arel

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

    Merge pull request #5096 from lawso017/master

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

    add AS::SafeBuffer#clone_empty

    amatsuda authored tenderlove committed
Commits on Feb 20, 2012
  1. @lest @tenderlove

    fix output safety issue with select options

    lest authored tenderlove committed
  2. @tenderlove
  3. @pixeltrix

    Remove fixture files with Windows incompatible filenames

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

    fixed assets test

    arunagw authored
Commits on Feb 17, 2012
  1. @pixeltrix

    Simplify regexp

    pixeltrix authored
  2. @pixeltrix

    Fix ActionDispatch::Static to serve files with unencoded PCHAR

    pixeltrix authored
    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
  3. @spastorino

    Merge pull request #5072 from arunagw/fix_failing_test_ruby187_p358_3…

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

    Merge pull request #4787 from kennyj/fix_4754-2

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

    Merge pull request #4514 from brainopia/update_timezone_offets

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

    Fix ActiveModel::Errors#dup

    pkondzior authored drogus committed
    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.
  2. @drogus
Commits on Jan 21, 2012
  1. @vijaydev

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

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

    Mention how use config.assets.prefix to avoid conflicting with an exi…

    guilleiguaran authored vijaydev committed
    …sting "/assets" route
Commits on Jan 13, 2012
  1. @josevalim

    No AS::TestCase here.

    josevalim authored
  2. @josevalim
  3. @vijaydev

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

    vijaydev authored
    Update actionpack changelog in 3-1-stable
  4. @guilleiguaran
Commits on Jan 12, 2012
  1. @vijaydev
Something went wrong with that request. Please try again.