Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Tag: v3.1.5.rc1
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.1.5.rc1

    tenderlove authored
Commits on May 13, 2012
  1. @rafaelfranca

    Merge pull request #3237 from sakuro/data-url-scheme

    rafaelfranca authored
    Support data: url scheme
  2. @spastorino
  3. @guilleiguaran
Commits on May 11, 2012
  1. @spastorino
  2. @arunagw
  3. @drogus

    Merge pull request #6261 from carlosantoniodasilva/fix-build-3-1

    drogus authored
    Fix build 3-1-stable
  4. @carlosantoniodasilva
Commits on May 10, 2012
  1. @pixeltrix
  2. @pixeltrix

    Refactor the handling of default_url_options in integration tests

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

    Merge pull request #6152 from route/assets_precompile_task_3_1

    jeremy authored
    Just cherry-picked fixes for asset precompile for 3-1-stable
  2. @route
  3. @route
Commits on May 2, 2012
  1. @pixeltrix

    Reset the request parameters after a constraints check

    pixeltrix authored
    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
  1. @vijaydev
Commits on Apr 30, 2012
  1. @IamNaN @pixeltrix

    Correcting some confusion. Pago Pago is part of American Samoa, not S…

    IamNaN authored pixeltrix committed
    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. @drogus

    Failing test for #6034

    drogus authored
  3. @willbryant @drogus

    fix the Flash middleware loading the session on every request (very d…

    willbryant authored drogus committed
    …angerous especially with Rack::Cache), it should only be loaded when the flash method is called
Commits on Apr 29, 2012
  1. @pixeltrix
  2. @jeremy

    Merge pull request #6046 from arunagw/lock_mocha_to_fix_build

    jeremy authored
    Lock mocha to fix build
  3. @arunagw

    mocha can be locked here as new version is failing

    arunagw authored
    nil.stubs is not allowed in new version of mocha
  4. @pixeltrix

    Don't convert params if the request isn't HTML - fixes #5341

    pixeltrix authored
    (cherry picked from commit d6bbd33)
Commits on Apr 16, 2012
  1. @jeremy

    Merge pull request #5862 from arunagw/multi_json_fix_3-1-stable

    jeremy authored
    Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
  2. @arunagw

    multi_json is restricted to < 1.3.

    arunagw authored
    Some API changes are there above 1.3.
Commits on Apr 3, 2012
  1. @josevalim
Commits on Mar 31, 2012
  1. @arunagw

    CHANGELOG entry added

    arunagw authored
  2. @arunagw

    :subdomain can now be specified with a value of false in url_for,

    arunagw authored
    allowing for subdomain(s) removal from the host during link generation. 
    Closes #4083
    cherry-picked from 
Commits on Mar 29, 2012
  1. @spastorino

    Merge pull request #5658 from yahonda/address_ora_00918_with_oracle_f…

    spastorino authored
    Address an error for test_has_many_through_polymorphic_has_one with Oracle
  2. @tenderlove

    Merge pull request #5647 from arturopie/fixing_IM_when_using_find_select

    tenderlove authored
    Fixing Identity Map when using find select
  3. @yahonda

    Address an error for test_has_many_through_polymorphic_has_one

    yahonda authored
    with Oracle for the 3-1-stable branch
  4. @arturopie

    refactor instantiate method in base, so we remove nesting if's which …

    arturopie authored
    …make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
Commits on Mar 28, 2012
  1. @arturopie

    refactor the checking of the attributes of the record in IdentityMap#…

    arturopie authored
    …add, so it's more readable
  2. @arturopie

    Do not add record to identity map if the record doesn't have values f…

    arturopie authored
    …or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
  3. @arturopie
Commits on Mar 27, 2012
  1. @josevalim @drogus

    Avoid inspecting the whole route set, closes #1525

    josevalim authored drogus committed
Something went wrong with that request. Please try again.