Permalink
Commits on Feb 21, 2012
  1. add AS::SafeBuffer#clone_empty

    amatsuda committed with tenderlove Feb 13, 2012
Commits on Feb 20, 2012
  1. Fix a failing test

    spastorino committed Feb 20, 2012
  2. Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset

    josevalim committed Feb 20, 2012
    Reset memoized hash keys when new ActionView::Template handler is registered
  3. sync __run_callbacks with ruby-trunk

    funny-falcon committed with tenderlove Feb 14, 2012
    https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
    In this revision behavior of respond_to? had changed: now to ask about
    protected method one should pass second argument `true`
  4. Remove fixture files with Windows incompatible filenames

    pixeltrix committed Feb 20, 2012
    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. fix a typo [ci skip]

    vijaydev committed Feb 18, 2012
  2. fix spacer template example

    lest committed with vijaydev Feb 12, 2012
  3. Merge pull request #5081 from arunagw/fix_ar_test

    fxn committed Feb 18, 2012
    Fix ar test
  4. fix test with ruby 187-p358

    arunagw committed Feb 18, 2012
Commits on Feb 17, 2012
  1. Simplify regexp

    pixeltrix committed Feb 17, 2012
  2. Fix ActionDispatch::Static to serve files with unencoded PCHAR

    pixeltrix committed Feb 17, 2012
    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. Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358

    spastorino committed Feb 17, 2012
    Fix failing test ruby187 p358
  4. Merge pull request #5073 from asanghi/4918_backport

    josevalim committed Feb 17, 2012
    Backporting #4918 with one added test for googlebot accept header as I saw it
  5. backporting #4918 to 3.2 stable; adding extra test for accept header …

    Aditya Sanghi committed Feb 17, 2012
    …given by googlebot
  6. Fixes failing test with ruby 1.8.7-p358

    arunagw committed Feb 17, 2012
    Same as 91a9b24
Commits on Feb 15, 2012
  1. Merge pull request #5049 from fabioyamate/master

    josevalim committed Feb 15, 2012
    Fix sanitize_for_mass_assigment when role is nil
Commits on Feb 14, 2012
  1. Rack body respond to each and not to join

    spastorino committed Feb 14, 2012
    This fixes undef `to_str' for Rack::Chunked::Body when using
    caches_action + streaming on an action
    
    Closes #5027
  2. Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo

    josevalim committed Feb 14, 2012
    Always reenable _dump task in AR databases rake. Closes #5030
Commits on Feb 13, 2012
Commits on Feb 10, 2012
  1. Fix that failed tests should exit with a nonzero error code.

    jeremy committed with tenderlove Feb 7, 2012
    Partially reverts 14c89e7.
    
    Hat tip to @tenderlove for paring down the TestTask!
  2. Merge pull request #4988 from kennyj/fix_4720-3

    tenderlove committed Feb 10, 2012
    Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
Commits on Feb 8, 2012
  1. Merge pull request #4941 from rafaelfranca/fix-build

    josevalim committed Feb 8, 2012
    Use real table and columns for index test
  2. Handle nil in add_index :length option in MySQL

    paul committed with josevalim Jan 24, 2012
    Our schema.rb is being generated with an `add_index` line similar to this:
    
        add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}
    
    This is the same as it was on Rails 3.1.3, however, now when that
    schema.rb is evaluated, its generating bad SQL in MySQL:
    
        Mysql::Error: You have an error in your SQL syntax; check the manual
        that corresponds to your MySQL server version for the right syntax
        to use near '))' at line 1: CREATE UNIQUE INDEX
        `xxx` ON `foo` (`foo`(8), `bar`())
    
    This commit adds a check for nil on the length attribute to prevent the
    empty parens from being output.
    
    Conflicts:
    
    	activerecord/test/cases/migration/index_test.rb
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Feb 7, 2012
  1. Fix attribute_before_type_cast for serialized attributes. Fixes #4837.

    jonleighton committed Feb 7, 2012
    Conflicts:
    
    	activerecord/lib/active_record/core.rb