Skip to content
Commits on Nov 12, 2012
  1. @spastorino

    Bump to 3.2.9

    spastorino committed Nov 12, 2012
Commits on Nov 9, 2012
  1. @spastorino

    Bump up to 3.2.9.rc3

    spastorino committed Nov 9, 2012
  2. @rafaelfranca @spastorino

    Merge pull request #8161 from guilleiguaran/downgrade-sprockets

    rafaelfranca committed with spastorino Nov 9, 2012
    Lock sprockets to 2.2.x
    
    REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release.
    
    In a next release we can relax the dependency again.
    
    See #8099 for more information.
Commits on Nov 2, 2012
  1. @spastorino
  2. @rafaelfranca
  3. @rafaelfranca

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

    rafaelfranca committed Nov 2, 2012
    This reverts commit 61d5d2d.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    REASON: This added a backward incompatible change.
Commits on Nov 1, 2012
  1. @spastorino

    Bump to 3.2.9.rc2

    spastorino committed Nov 1, 2012
Commits on Oct 31, 2012
  1. @rafaelfranca

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

    rafaelfranca committed Oct 31, 2012
    …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 committed Oct 30, 2012
    …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 29, 2012
  1. @spastorino

    Bump to 3.2.9.rc1

    spastorino committed Oct 29, 2012
Commits on Oct 7, 2012
  1. @rafaelfranca

    Merge pull request #7865 from teleological/link_to_remote_3_2

    rafaelfranca committed Oct 6, 2012
    Accept :remote as symbol in link_to options (backport)
Commits on Oct 6, 2012
  1. @rafaelfranca
  2. @teleological

    Accept :remote as symbol in link_to options

    teleological committed with teleological Oct 6, 2012
    Accept either :remote or 'remote' in both the html_options and
    (url_)options hash arguments to link_to.
  3. @rafaelfranca

    Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…

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

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

    jeremy committed Sep 30, 2012
    …ersa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
  2. @rafaelfranca
  3. @rafaelfranca

    Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased

    rafaelfranca committed Sep 29, 2012
    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 committed with yabawock Jun 21, 2012
    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 28, 2012
  1. @jeremy
Commits on Sep 20, 2012
  1. @rafaelfranca

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

    rafaelfranca committed Sep 20, 2012
    This reverts commit 54f5574.
    
    Reason: the last commit fixed the failing case
  2. @rafaelfranca

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

    rafaelfranca committed Sep 20, 2012
    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 committed Sep 19, 2012
    Removing to_shorthand to fix #6497
    Conflicts:
    	actionpack/CHANGELOG.md
Commits on Sep 17, 2012
  1. @wagenet

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

    wagenet committed Sep 17, 2012
    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.
  2. @senny @rafaelfranca

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

    senny committed with rafaelfranca Sep 16, 2012
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/log_subscriber.rb
Commits on Aug 29, 2012
  1. @marcandre @steveklabnik
Commits on Aug 28, 2012
  1. @fxn

    CHANGELOGs are now per branch

    fxn committed Aug 28, 2012
    Check 810a50d for the rationale.
Commits on Aug 25, 2012
  1. @nashby

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

    nashby committed Aug 23, 2012
    … 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
Commits on Aug 21, 2012
  1. @rafaelfranca

    Merge pull request #7410 from sandeepravi/default_options_helper_value

    rafaelfranca committed Aug 21, 2012
    option_tags coerced to "" instead of nil
    
    Closes #7404
Commits on Aug 15, 2012
  1. @jeremy

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

    jeremy committed with Erich Menge Apr 12, 2012
    …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 Aug 11, 2012
  1. @brainopia
Commits on Aug 10, 2012
  1. @brainopia
  2. @brainopia
Something went wrong with that request. Please try again.