Switch branches/tags
Commits on May 28, 2012
  1. bumping to 3.1.5.rc1

    tenderlove committed May 28, 2012
Commits on May 13, 2012
  1. Merge pull request #3237 from sakuro/data-url-scheme

    rafaelfranca committed May 13, 2012
    Support data: url scheme
  2. Merge pull request #6300 from guilleiguaran/upgrade-sprockets-3-1-stable

    spastorino committed May 13, 2012
    Upgrade sprockets to 2.0.4
Commits on May 11, 2012
  1. Merge pull request #6263 from arunagw/3-1-stable

    spastorino committed May 11, 2012
    3 1 stable
  2. Merge pull request #6261 from carlosantoniodasilva/fix-build-3-1

    drogus committed May 11, 2012
    Fix build 3-1-stable
Commits on May 10, 2012
  1. Refactor the handling of default_url_options in integration tests

    pixeltrix committed May 10, 2012
    This commit improves the handling of default_url_options in integration
    tests by making behave closer to how a real application operates.
    Specifically the following issues have been addressed:
    * Options specified in routes.rb are used (fixes #546)
    * Options specified in controllers are used
    * Request parameters are recalled correctly
    * Tests can override default_url_options directly
Commits on May 4, 2012
  1. Merge pull request #6152 from route/assets_precompile_task_3_1

    jeremy committed May 4, 2012
    Just cherry-picked fixes for asset precompile for 3-1-stable
Commits on May 2, 2012
  1. Reset the request parameters after a constraints check

    pixeltrix committed May 2, 2012
    A callable object passed as a constraint for a route may access the request
    parameters as part of its check. This causes the combined parameters hash
    to be cached in the environment hash. If the constraint fails then any subsequent
    access of the request parameters will be against that stale hash.
    To fix this we delete the cache after every call to `matches?`. This may have a
    negative performance impact if the contraint wraps a large number of routes as the
    parameters hash is built by merging GET, POST and path parameters.
    Fixes #2510.
    (cherry picked from commit 5603050)
Commits on May 1, 2012
Commits on Apr 30, 2012
  1. Correcting some confusion. Pago Pago is part of American Samoa, not S…

    IamNaN authored and pixeltrix committed Apr 13, 2012
    Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011
    switching from UTC-11 to UTC+13. American Samoa did not make the change and
    remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and
    documentation about the dateline change is in austalasia at IANA.
    (cherry picked from commit 5fe88b1)
  2. Failing test for #6034

    drogus committed Apr 30, 2012
  3. fix the Flash middleware loading the session on every request (very d…

    willbryant authored and drogus committed Jan 23, 2012
    …angerous especially with Rack::Cache), it should only be loaded when the flash method is called
Commits on Apr 29, 2012
  1. Merge pull request #6046 from arunagw/lock_mocha_to_fix_build

    jeremy committed Apr 29, 2012
    Lock mocha to fix build
  2. mocha can be locked here as new version is failing

    arunagw committed Apr 29, 2012
    nil.stubs is not allowed in new version of mocha
  3. Don't convert params if the request isn't HTML - fixes #5341

    pixeltrix committed Apr 29, 2012
    (cherry picked from commit d6bbd33)
Commits on Apr 16, 2012
  1. Merge pull request #5862 from arunagw/multi_json_fix_3-1-stable

    jeremy committed Apr 16, 2012
    Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
  2. multi_json is restricted to < 1.3.

    arunagw committed Apr 16, 2012
    Some API changes are there above 1.3.
Commits on Apr 3, 2012
  1. Merge pull request #5686 from arunagw/issue_4083

    josevalim committed Apr 3, 2012
    Issue 4083
Commits on Mar 31, 2012
  1. CHANGELOG entry added

    arunagw committed Mar 31, 2012
  2. :subdomain can now be specified with a value of false in url_for,

    arunagw committed Mar 31, 2012
    allowing for subdomain(s) removal from the host during link generation. 
    Closes #4083
    cherry-picked from 
Commits on Mar 29, 2012
  1. Merge pull request #5658 from yahonda/address_ora_00918_with_oracle_f…

    spastorino committed Mar 29, 2012
    Address an error for test_has_many_through_polymorphic_has_one with Oracle
  2. Merge pull request #5647 from arturopie/fixing_IM_when_using_find_select

    tenderlove committed Mar 29, 2012
    Fixing Identity Map when using find select
  3. Address an error for test_has_many_through_polymorphic_has_one

    yahonda committed Mar 29, 2012
    with Oracle for the 3-1-stable branch
  4. refactor instantiate method in base, so we remove nesting if's which …

    arturopie committed Mar 27, 2012
    …make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
Commits on Mar 28, 2012
  1. refactor the checking of the attributes of the record in IdentityMap#…

    arturopie committed Mar 27, 2012
    …add, so it's more readable
  2. Do not add record to identity map if the record doesn't have values f…

    arturopie committed Mar 26, 2012
    …or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
Commits on Mar 27, 2012