Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 2, 2014
  1. @rafaelfranca
Commits on May 6, 2014
  1. @rafaelfranca

    Merge branch '3-2-sec' into 3-2-stable

    rafaelfranca authored
    Conflicts:
    	actionpack/CHANGELOG.md
  2. @rafaelfranca
Commits on Feb 18, 2014
  1. @rafaelfranca

    Merge branch '3-2-17' into 3-2-stable

    rafaelfranca authored
    Conflicts:
    	actionpack/CHANGELOG.md
  2. @rafaelfranca
Commits on Jul 22, 2013
  1. @rafaelfranca

    Fix actionpack CHANGELOG entry

    rafaelfranca authored
    It was included by git on the wrong release
  2. @rafaelfranca
  3. @rafaelfranca

    Update CHANGELOG entry

    rafaelfranca authored
Commits on Jul 16, 2013
  1. @rafaelfranca
Commits on Jul 13, 2013
  1. @rafaelfranca
Commits on Jun 24, 2013
  1. @rafaelfranca

    Add CHANGELOG entry for #10971

    rafaelfranca authored
    [ci skip]
Commits on Jun 17, 2013
  1. @rafaelfranca

    Compare host scheme using case-insensitive regexp

    rafaelfranca authored
    Before:
    
        image_tag("HTTP://google.com")
        # => "<img alt=\"Google\" src=\"/assets/HTTP://google.com\" />"
        image_tag("http://google.com")
        # => "<img alt=\"Google\" src=\"http://google.com\" />"
    
    After:
    
        image_tag("HTTP://google.com")
        # => "<img alt=\"Google\" src=\"HTTP://google.com\" />"
        image_tag("http://google.com")
        # => "<img alt=\"Google\" src=\"http://google.com\" />"
    
    Backport of #10969
Commits on Apr 5, 2013
  1. @rafaelfranca
Commits on Mar 21, 2013
  1. @rafaelfranca
Commits on Mar 20, 2013
  1. @rafaelfranca

    Merge pull request #9802 from newsline/fix-broken-action-missing

    rafaelfranca authored
    Fix missing action_missing
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Conflicts:
    	actionpack/test/controller/base_test.rb
    
    Fixes #9799
Commits on Feb 14, 2013
  1. @rafaelfranca
  2. @rafaelfranca
Commits on Jan 16, 2013
  1. @rafaelfranca

    Merge pull request #8914 from nilbus/fix-header-bloat

    rafaelfranca authored
    Remove header bloat introduced by BestStandardsSupport middleware
    Conflicts:
    	actionpack/CHANGELOG.md
Commits on Jan 2, 2013
  1. @rafaelfranca

    Add release date of 3.2.10

    rafaelfranca authored
    Fix format and wrong changelog entry
  2. @rafaelfranca
Commits on Dec 12, 2012
  1. @rafaelfranca

    Merge pull request #8490 from mattv/fix_request_raw_post

    rafaelfranca authored
    Fix rewinding in ActionDispatch::Request#raw_post
    Conflicts:
    	actionpack/CHANGELOG.md
Commits on Dec 2, 2012
  1. @rafaelfranca

    Merge pull request #8402 from senny/8376_descriptive_error_message_fo…

    rafaelfranca authored
    …r_partial_layout_true
    
    More descriptive error when rendering a partial with `:layout => true`
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_view/renderer/partial_renderer.rb
Commits on Nov 8, 2012
  1. @rafaelfranca

    Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-i…

    rafaelfranca authored
    …nstance-tag
    
    Support :multiple option on input tags that also have :index
    Conflicts:
    	actionpack/lib/action_view/helpers/tags/base.rb
    	actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
Commits on Nov 2, 2012
  1. @rafaelfranca

    Revert "Merge pull request #7668 from Draiken/fix_issue_6497"

    rafaelfranca authored
    This reverts commit 61d5d2d.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    REASON: This added a backward incompatible change.
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 Oct 1, 2012
  1. @rafaelfranca

    Merge pull request #7789 from senny/7777_resource_functions_modify_op…

    rafaelfranca authored
    …tions
    
    resource and resources do no longer modify passed options
Commits on Sep 30, 2012
  1. @rafaelfranca
  2. @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 20, 2012
  1. @rafaelfranca

    Revert "Revert "Respect `config.digest = false` for `asset_path`""

    rafaelfranca authored
    This reverts commit 54f5574.
    
    Reason: the last commit fixed the failing case
  2. @rafaelfranca

    Revert "Respect `config.digest = false` for `asset_path`"

    rafaelfranca authored
    This reverts commit 1ac19c1.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Reason: This is causing failures in the railties build.
    See http://travis-ci.org/#!/rails/rails/jobs/2491787
    
    Related with #7672
Commits on Sep 19, 2012
  1. @rafaelfranca

    Merge pull request #7668 from Draiken/fix_issue_6497

    rafaelfranca authored
    Removing to_shorthand to fix #6497
    Conflicts:
    	actionpack/CHANGELOG.md
Commits on Aug 21, 2012
  1. @rafaelfranca

    Merge pull request #7410 from sandeepravi/default_options_helper_value

    rafaelfranca authored
    option_tags coerced to "" instead of nil
    
    Closes #7404
Something went wrong with that request. Please try again.