Permalink
Commits on Feb 18, 2012
  1. fix the Flash middleware loading the session on every request (very d…

    …angerous especially with Rack::Cache), it should only be loaded when the flash method is called
    committed Jan 23, 2012
Commits on Feb 17, 2012
  1. Simplify regexp

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

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

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

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

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

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

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

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

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

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

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

    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>
    paul committed with josevalim Jan 24, 2012
Commits on Feb 7, 2012
  1. Fix attribute_before_type_cast for serialized attributes. Fixes #4837.

    Conflicts:
    
    	activerecord/lib/active_record/core.rb
    jonleighton committed Feb 7, 2012
  2. no need to check for this constant

    fxn committed Feb 7, 2012
  3. Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_params

    Fixed force_ssl redirects to include original query params
    josevalim committed Feb 7, 2012
  4. Added unit test to cover changes to RouteSet.url_for

    ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
    ActionDispatch::Http::Url.url_for
    rmm5t committed Feb 7, 2012
  5. Fixed the documenation for 'to_xml'

    iblue committed with fxn Feb 7, 2012
  6. Merge pull request #4920 from guilleiguaran/revert-gemfile-edge

    In Rails 3.2.x --edge generate apps with rails 3-2-stable
    josevalim committed Feb 7, 2012
Commits on Feb 6, 2012
  1. Fixed force_ssl redirects to include original query params

    `ActionController.force_ssl` redirects http URLs to their https equivalent;
    however, when a URL contains a query string, the resulting redirect lacked the
    original query string.
    rmm5t committed Feb 6, 2012
  2. Merge pull request #4912 from guilleiguaran/fix-edge-gemfile

    Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)
    tenderlove committed Feb 6, 2012
  3. Add branch to sass-rails and coffee-rails for apps generated with --d…

    …ev or --edge options (3.2.x)
    guilleiguaran committed Feb 6, 2012
  4. Merge pull request #4908 from kennyj/fix_3864

    Fix url_for method's behavior. GH #3684.
    josevalim committed with josevalim Feb 6, 2012
Commits on Feb 5, 2012
  1. Merge pull request #4890 from kennyj/improvement_4883

    GH #4883. Optional start_day argument for Time#all_week
    spastorino committed Feb 5, 2012
Commits on Feb 4, 2012
  1. Merge pull request #4870 from sikachu/3-2-stable-responder-fix

    Fix override API response bug in respond_with
    josevalim committed Feb 4, 2012
  2. Merge pull request #4879 from kennyj/fix_4873

    Fix GH #4873. Allow swapping same class middleware.
    josevalim committed with josevalim Feb 4, 2012