Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 31, 2012
  1. @tenderlove

    bumping to 3.2.4

    tenderlove authored
Commits on May 30, 2012
  1. @tenderlove

    Strip [nil] from parameters hash.

    tenderlove authored
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.2.4.rc1

    tenderlove authored
Commits on May 26, 2012
  1. @bdurand @pwim

    remove unnecessary memcache equire in ActionDispatch::Session::CacheS…

    bdurand authored pwim committed
    …tore
Commits on May 21, 2012
  1. @lest

    Assets: don't add extension if other given and file exists

    lest authored
    We should lookup if asset without appended extension exists.
    When sprockets are disabled the asset tag helpers incorporate
    this logic. When sprockets are enabled we should have the same
    logic.
    
    For example, we have style.ext file in app/assets/stylesheets and
    we use stylesheet_link_tag in the layout. In this case we should
    have /assets/style.ext instead of /assets/style.ext.css in the
    output.
    
    Closes #6310
Commits on May 20, 2012
  1. @rafaelfranca

    Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable

    rafaelfranca authored
    TagHelper creates invalid data attributes when value is a BigDecimal
  2. @josevalim

    Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806…

    josevalim authored
    …f7b028614c
    
    Template concurrency fixes
  3. @Bodacious
  4. @pinetops
Commits on May 19, 2012
  1. @carlosantoniodasilva

    Use right option for excerpt text helper in tests, fix build

    carlosantoniodasilva authored
    `excerpt` text helper uses `:radius`, not `line_width` (that is used by
    `word_wrap` helper).
    
    Also cleanup some whitespaces.
Commits on May 18, 2012
  1. @josevalim @rafaelfranca

    Merge pull request #5020 from KL-7/fix-blank-image_tag-source

    josevalim authored rafaelfranca committed
    Render img tag with empty src if empty string is passed to image_tag.
  2. @iHiD
Commits on May 14, 2012
  1. Deprecate `:disable_with` for `button_tag` too

    Carlos Galdino + Rafael Mendonça França authored
  2. Fix typo

    Carlos Galdino + Rafael Mendonça França authored
  3. Deprecate `:disable_with` in favor of `'data-disable-with'` option fo…

    Carlos Galdino + Rafael Mendonça França authored
    …r `button_to` and `submit_tag` helpers.
Commits on May 13, 2012
  1. @rafaelfranca
  2. @rafaelfranca

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

    rafaelfranca authored
    Support data: url scheme
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 9, 2012
  1. @spastorino

    Merge pull request #6149 from jmbejar/javascript_include_tag_with_not…

    spastorino authored
    …_duplicates
    
    Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
Commits on May 7, 2012
  1. @whistlerbrk
Commits on May 4, 2012
  1. @nragaz

    Add a role option to wrap_parameters.

    nragaz authored
    The role option identifies which parameters are accessible and should be wrapped. The default role is :default.
Commits on May 3, 2012
  1. @jmbejar

    Make sure that javascript_include_tag/stylesheet_link_tag methods in

    jmbejar authored
    sprockets/helpers/rails_helper.rb discard duplicated assets
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 Apr 30, 2012
  1. @route
  2. @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
  3. @pixeltrix

    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)
  4. @rafaelfranca
  5. @rafaelfranca
Commits on Apr 29, 2012
  1. @pixeltrix
  2. @pixeltrix
  3. @pixeltrix
  4. @pixeltrix

    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
  5. @drogus
Commits on Apr 27, 2012
  1. @carlosantoniodasilva @sikachu

    Do not mutate options hash

    carlosantoniodasilva authored sikachu committed
Something went wrong with that request. Please try again.