Skip to content
This repository

Nov 09, 2012

  1. Santiago Pastorino

    Bump up to 3.2.9.rc3

    spastorino authored

Nov 02, 2012

  1. Santiago Pastorino

    Clear url helpers when reloading routes

    spastorino authored
  2. Rafael Mendonça França

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

    This reverts commit 61d5d2d.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    REASON: This added a backward incompatible change.
    rafaelfranca authored

Nov 01, 2012

  1. Santiago Pastorino

    Bump to 3.2.9.rc2

    spastorino authored

Oct 31, 2012

  1. Rafael Mendonça França

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

    …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.
    rafaelfranca authored
  2. Rafael Mendonça França

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

    …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.
    rafaelfranca authored

Oct 29, 2012

  1. Santiago Pastorino

    Bump to 3.2.9.rc1

    spastorino authored

Oct 06, 2012

  1. Riley Martinez-Lynch

    Accept :remote as symbol in link_to options

    Accept either :remote or 'remote' in both the html_options and
    (url_)options hash arguments to link_to.
    teleological authored teleological committed
  2. Rafael Mendonça França

    Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…

    …able
    
    can't pass :locals to #assert_template without a view test case (#3415)
    Conflicts:
    	actionpack/CHANGELOG.md
    rafaelfranca authored

Oct 02, 2012

  1. Rafael Mendonça França

    Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…

    …riables
    
    prefix TemplateAssertions ivars.
    
    Closes #7459
    Conflicts:
    	actionpack/lib/action_controller/test_case.rb
    	actionpack/lib/action_view/test_case.rb
    rafaelfranca authored

Oct 01, 2012

  1. Rafael Mendonça França

    Merge pull request #7789 from senny/7777_resource_functions_modify_op…

    …tions
    
    resource and resources do no longer modify passed options
    rafaelfranca authored
  2. Rafael Mendonça França

    Since File instance doesn't respond to #open use a double to test the

    behavior added at c53e5de
    rafaelfranca authored

Sep 30, 2012

  1. Jeremy Kemper

    Asset manifest includes aliases for foo.js -> foo/index.js and vice v…

    …ersa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
    jeremy authored
  2. Rafael Mendonça França

    Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased

    REBASED: fixing assert_template bug when template matches expected, but not ends with
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/test_case.rb
    rafaelfranca authored

Sep 29, 2012

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

    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)
    Tim Vandecasteele authored yabawock committed

Sep 28, 2012

  1. Jeremy Kemper

    Shush uninitialized @_layout warning

    jeremy authored

Sep 20, 2012

  1. Rafael Mendonça França

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

    This reverts commit 54f5574.
    
    Reason: the last commit fixed the failing case
    rafaelfranca authored
  2. Rafael Mendonça França

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

    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
    rafaelfranca authored

Sep 19, 2012

  1. Rafael Mendonça França

    Merge pull request #7668 from Draiken/fix_issue_6497

    Removing to_shorthand to fix #6497
    Conflicts:
    	actionpack/CHANGELOG.md
    rafaelfranca authored

Sep 17, 2012

  1. Peter Wagenet

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

    Previously, the `asset_path` internals only respected the `:digest`
    option, but ignored the global config setting. This meant that
    `config.digest = false` could not be used in conjunction with
    `config.compile = false` this corrects the behavior.
    wagenet authored
  2. Yves Senn

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

    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/log_subscriber.rb
    senny authored rafaelfranca committed

Aug 29, 2012

  1. Marc-André Lafortune

    Fix bug when Rails.application is defined but is nil. See #881

    marcandre authored steveklabnik committed

Aug 25, 2012

  1. Vasiliy Ermolovich

    correct handling of date selects when using both disabled and discard…

    … options
    
    we should take disabled option not only from `html_options` hash but from
    `options` hash too like `build_select` method does it. So
    
    datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true })
    datetime_select("post", "updated_at", :discard_minute => true , :disabled => true)
    
    both these variants work now
    
    closes #7431
    nashby authored

Aug 21, 2012

  1. Rafael Mendonça França

    Merge pull request #7410 from sandeepravi/default_options_helper_value

    option_tags coerced to "" instead of nil
    
    Closes #7404
    rafaelfranca authored

Aug 15, 2012

  1. Jeremy Kemper

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

    …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.
    jeremy authored Erich Menge committed

Aug 10, 2012

  1. Ravil Bayramgalin

    Dont stream back cookie value if it was set to the same value

    brainopia authored
  2. Ravil Bayramgalin

    Revert "Revert "Merge pull request #6084 from brainopia/support_for_m…

    …agic_domain_on_all_stores""
    
    This reverts commit a48ea68.
    brainopia authored

Aug 09, 2012

  1. Santiago Pastorino

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

    spastorino authored
  2. Santiago Pastorino

    Bump to 3.2.8

    spastorino authored
  3. Santiago Pastorino

    Do not mark strip_tags result as html_safe

    Thanks to Marek Labos & Nethemba
    
    CVE-2012-3465
    spastorino authored
  4. Santiago Pastorino

    escape select_tag :prompt values

    CVE-2012-3463
    spastorino authored

Aug 07, 2012

  1. Rafael Mendonça França

    Remove references to old behavior with headers at

    ActionDispatch::Integration::ResquestHelpers.
    
    The behavior has removed at 4a6f4b9 to
    increase the compatibility with Rack::Test
    
    Closes #7136
    
    [ci skip]
    rafaelfranca authored

Aug 06, 2012

  1. Prem Sichanugrist

    Rearrange example output of javascript_include_tag

    sikachu authored
  2. Prem Sichanugrist

    Do not include application.js if it doesn't exists

    Rails were including 'application.js' to the pack when using
    `javascript_include_tag :all` even there's no application.js in the
    public directory.
    sikachu authored

Aug 05, 2012

  1. Rafael Mendonça França

    Revert "Merge pull request #6084 from brainopia/support_for_magic_dom…

    …ain_on_all_stores"
    
    This reverts commit 393c652.
    
    This commit was supposed to fix a bug but it add more failures.
    rafaelfranca authored
Something went wrong with that request. Please try again.