Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Oct 31, 2012
  1. @rafaelfranca

    Revert "Merge pull request #7659 from HugoLnx/template_error_no_match…

    rafaelfranca authored
    …es_rebased"
    
    This reverts commit 7d17cd2.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Reason: This added a regression since people were relying on this buggy behavior.
    This will introduce back #3849 but we will be backward compatible in
    stable release.
    
    Fixes #8068.
  2. @rafaelfranca

    Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_asse…

    rafaelfranca authored
    …rtion_variables"
    
    This reverts commit 2bad605.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Reason: This added a regression related with shoulda-matchers, since it
    is expecting the instance variable @layouts
    
    See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74
    
    This will introduce back #7459 but this stable release will be backward compatible.
    Related with #8068.
Commits on Oct 6, 2012
  1. @rafaelfranca

    Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…

    rafaelfranca authored
    …able
    
    can't pass :locals to #assert_template without a view test case (#3415)
    Conflicts:
    	actionpack/CHANGELOG.md
Commits on Oct 2, 2012
  1. @rafaelfranca

    Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…

    rafaelfranca authored
    …riables
    
    prefix TemplateAssertions ivars.
    
    Closes #7459
    Conflicts:
    	actionpack/lib/action_controller/test_case.rb
    	actionpack/lib/action_view/test_case.rb
Commits on Sep 30, 2012
  1. @rafaelfranca

    Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased

    rafaelfranca authored
    REBASED: fixing assert_template bug when template matches expected, but not ends with
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/test_case.rb
Commits on Sep 29, 2012
  1. @yabawock

    Don't paramify ActionDispatch::Http::UploadedFile in tests

    Tim Vandecasteele authored yabawock committed
    To test uploading a file without using fixture_file_upload, a posted
    ActionDispatch::Http::UploadedFile should not be paramified (just like
    Rack::Test::UploadedFile).
    (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't
    share the same API, tempfile is not accessible on
    Rack::Test::UploadedFile as discussed in
    brynary/rack-test#30)
Commits on Sep 17, 2012
  1. @senny @rafaelfranca

    log 404 status when ActiveRecord::RecordNotFound was raised (#7646)

    senny authored rafaelfranca committed
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/log_subscriber.rb
Commits on Aug 15, 2012
  1. @jeremy

    Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redir…

    jeremy authored Erich Menge committed
    …ect the file's path, so opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
Commits on Jul 26, 2012
  1. @tenderlove
Commits on Jul 5, 2012
  1. @route

    Show in log correct wrapped keys

    route authored
Commits on Jun 13, 2012
  1. @spastorino
Commits on Jun 5, 2012
  1. @rafaelfranca

    Revert "fix the Flash middleware loading the session on every request…

    rafaelfranca authored
    … (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called"
    
    This reverts commits e3069c6 and 2b2983d.
    
    Reason: This add a non-backward compatible change in the way that flash
    works now (swept in every request).
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 Apr 30, 2012
  1. @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
  2. @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)
Commits on Apr 29, 2012
  1. @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
Commits on Mar 20, 2012
  1. @dhh

    We dont need to merge in the parameters as thats all being reset by t…

    dhh authored
    …he rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
Commits on Mar 15, 2012
  1. @tenderlove

    Merge pull request #5456 from brianmario/redirect-sanitization

    tenderlove authored
    Strip null bytes from Location header
  2. @drogus

    Remove ActionController::TestCase#rescue_action_in_public!

    drogus authored
    This method has no effect since exception handling was
    moved to middlewares and ActionController tests do not
    use any middlewares.
Commits on Mar 7, 2012
  1. @josevalim
  2. @josevalim
Commits on Mar 6, 2012
  1. @spastorino
  2. @sikachu

    Always passing a respond block from to responder

    sikachu authored
    We should let the responder to decide what to do with the given
    overridden response block, and not short circuit it.
    
    Fixes #5280
Commits on Feb 22, 2012
  1. @spastorino

    format lookup for partials is derived from the format in which the te…

    spastorino authored
    …mplate is being rendered
    
    Closes #5025 part 2
Commits on Feb 20, 2012
  1. @tenderlove
Commits on Feb 14, 2012
  1. @spastorino

    Rack body respond to each and not to join

    spastorino authored
    This fixes undef `to_str' for Rack::Chunked::Body when using
    caches_action + streaming on an action
    
    Closes #5027
Commits on Feb 6, 2012
  1. @rmm5t

    Fixed force_ssl redirects to include original query params

    rmm5t authored
    `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.
Commits on Feb 4, 2012
  1. @josevalim
Commits on Feb 3, 2012
  1. @sikachu

    Fix override API response bug in respond_with

    sikachu authored
    Default responder was only using the given respond block when user
    requested for HTML format, or JSON/XML format with valid resource. This
    fix the responder so that it will use the given block regardless of the
    validity of the resource. Note that in this case you'll have to check
    for object's validity by yourself in the controller.
    
    Fixes #4796
Commits on Jan 25, 2012
  1. @damln @vijaydev

    example bracket error

    damln authored vijaydev committed
Commits on Jan 19, 2012
  1. @josevalim

    Do not deprecate performed?

    josevalim authored
Commits on Jan 17, 2012
  1. @carlosantoniodasilva

    Remove duplicated constant definition

    carlosantoniodasilva authored
    ActionController::ActionControllerError is already defined in
    action_controller/metal/exceptions.
  2. @carlosantoniodasilva

    Deprecate AC::UnknownError and AC::DoubleRenderError

    carlosantoniodasilva authored
    Use the constants AbstractController::ActionNotFound and
    AbstractController::DoubleRenderError respectively instead.
  3. @carlosantoniodasilva
Something went wrong with that request. Please try again.