Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: assets_precomp…
Commits on May 1, 2012
Commits on Apr 30, 2012
  1. Dave Gerton Andrew White

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

    IamNaN authored pixeltrix committed
    …amoa.
    
    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 1d08ce5)
  2. Piotr Sarnacki

    Failing test for #6034

    drogus authored
  3. Will Bryant Piotr Sarnacki

    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
  4. Andrew White

    Add note about using 303 See Other for XHR requests other than GET/POST

    pixeltrix authored
    IE since version 6 and recently Chrome and Firefox have started following
    302 redirects from XHR requests other than GET/POST using the original request
    method. This can lead to DELETE requests being redirected amongst other things.
    
    Although it doesn't directly affect the Rails framework since it doesn't return
    a 302 redirect to any non-GET/POST request a note has been added to raise
    awareness of the issue. Some references:
    
    Original article from @technoweenie:
    http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/
    
    Hacker News discussion of the article:
    http://news.ycombinator.com/item?id=2903493
    
    WebKit bug report:
    https://bugs.webkit.org/show_bug.cgi?id=46183
    
    Firefox bug report and changeset:
    https://bugzilla.mozilla.org/show_bug.cgi?id=598304
    https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d
    
    Chrome bug report:
    http://code.google.com/p/chromium/issues/detail?id=56373
    
    HTTPbis bug report and changeset:
    http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160
    http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428
    
    Roy T. Fielding's history of the issue:
    http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html
    
    Automated browser tests for the issue:
    http://www.mnot.net/javascript/xmlhttprequest/
    
    Fixes #4144
    (cherry picked from commit 24f1437)
  5. Jeremy Kemper

    Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers

    jeremy authored
    Deprecate link_to_function and button_to_function
  6. Rafael Mendonça França
  7. Rafael Mendonça França

    Add CHANGELOG entry.

    rafaelfranca authored
    Closes #5886
    Closes #3093
  8. Rafael Mendonça França
  9. Rafael Mendonça França
Commits on Apr 29, 2012
  1. Andrew White
  2. Andrew White
  3. Andrew White
  4. José Valim

    Merge pull request #6051 from rafaelfranca/fix_build

    josevalim authored
    Fix the build
  5. Rafael Mendonça França
  6. Rafael Mendonça França

    Fix the build.

    rafaelfranca authored
    * The method for persisted records in 3-2-branch is 'PUT'
    * size is generated by default in inputs
  7. Andrew White

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

    pixeltrix authored
    (cherry picked from commit 7a80b69)
    
    Conflicts:
    
    	actionpack/test/controller/test_test.rb
  8. Piotr Sarnacki
Commits on Apr 28, 2012
  1. Allow Thor 0.15 and 1.0, to be released shortly

    tomhuda authored
  2. Piotr Sarnacki

    Merge pull request #6038 from arunagw/warning_removed_3-2-stable

    drogus authored
    Warning removed 3 2 stable
  3. Oscar Del Ben Arun Agrawal

    Remove circular require of time/zones

    oscardelben authored arunagw committed
Commits on Apr 27, 2012
  1. Aaron Patterson

    Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport

    tenderlove authored
    Do not mutate options hash
  2. Carlos Antonio da Silva Prem Sichanugrist

    Do not mutate options hash

    carlosantoniodasilva authored sikachu committed
  3. Aaron Patterson

    Merge pull request #4528 from j-manu/log-tailer-fix

    tenderlove authored
    Fix for log tailer when the log file doesn't exist.
Commits on Apr 26, 2012
  1. Vijay Dev
Commits on Apr 25, 2012
  1. Jeremy Kemper

    Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2

    jeremy authored
    Add extra order clause to fix failing test on Ruby 1.8.7
Commits on Apr 24, 2012
  1. Carlos Antonio da Silva
  2. Jeremy Kemper

    Merge pull request #5968 from sikachu/3-2-stable-backport

    jeremy authored
    Backport workarounds for Mocha behavior changes.
  3. Toshinori Kajihara Prem Sichanugrist

    Fix build. It seems that the Mocha's behavior were changed.

    kennyj authored sikachu committed
Commits on Apr 23, 2012
  1. Santiago Pastorino

    Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflict

    spastorino authored
    Fix broken test from the earlier merge conflict
  2. Prem Sichanugrist

    Fix broken test from the earlier merge conflict

    sikachu authored
    Seriously people, please run the test before submitting pull request.
  3. Aaron Patterson

    Merge pull request #5866 from tiegz/minor_fixes_3-2-stable

    tenderlove authored
    Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
  4. Jeremy Kemper

    Merge pull request #5919 from joevandyk/rake-dsl-fix

    jeremy authored
    Only include Rake::DSL if it's defined (Rake >= 0.9)
  5. Vijay Dev

    Merge pull request #5936 from arunagw/other_readme_fixes

    vijaydev authored
    Updated other README to point 3-2-stable
Something went wrong with that request. Please try again.