Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 30, 2012
  1. @jeremy

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

    jeremy authored
    …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 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 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 Sep 17, 2012
  1. @wagenet

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

    wagenet authored
    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 authored rafaelfranca committed
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/log_subscriber.rb
Commits on Aug 28, 2012
  1. @fxn

    CHANGELOGs are now per branch

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

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

    nashby authored
    … 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 authored
    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 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 Aug 11, 2012
  1. @brainopia
Commits on Aug 9, 2012
  1. @spastorino
  2. @spastorino
  3. @spastorino

    Do not mark strip_tags result as html_safe

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

    escape select_tag :prompt values

    spastorino authored
    CVE-2012-3463
Commits on Aug 8, 2012
  1. @rafaelfranca

    Fix CHANGELOG [ci skip]

    rafaelfranca authored
Commits on Aug 6, 2012
  1. @sikachu

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

    sikachu authored
    Rails were including 'application.js' to the pack when using
    `javascript_include_tag :all` even there's no application.js in the
    public directory.
Commits on Aug 1, 2012
  1. @rafaelfranca
  2. @rafaelfranca

    Revert "Deprecate `:mouseover` options for `image_tag` helper."

    rafaelfranca authored
    This reverts commit 1aff772.
    
    Conflicts:
    	actionpack/CHANGELOG.md
  3. @rafaelfranca

    Fix CHANGELOGS

    rafaelfranca authored
  4. @rafaelfranca

    Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Tex…

    rafaelfranca authored
    …t' }` option"
    
    Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers."
    
    This reverts commit fc092a9.
    This reverts commit e9051e2.
    This reverts commit d47d6e7.
    This reverts commit 21141e7.
  5. @spastorino

    Add missing CHANGELOG entries

    spastorino authored
    [ci skip]
Commits on Jul 26, 2012
  1. @tenderlove

    updating release date

    tenderlove authored
  2. @tenderlove

    updating the changelog

    tenderlove authored
Commits on Jul 23, 2012
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Jun 12, 2012
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Jun 11, 2012
  1. @tenderlove
Commits on Jun 5, 2012
  1. @carlosgaldino

    Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op…

    carlosgaldino authored
    …tion
    
    This deprecation applies to:
    `button_to`
    `button_tag`
    `image_submit_tag`
    `link_to`
    `submit_tag`
    
    As :confirm is an UI specific option is better to use the data attributes,
    teaching users about unobtrusive JavaScript and how Rails works with it.
Commits on Jun 1, 2012
  1. @drogus

    Allow to use mounted helpers in ActionView::TestCase

    drogus authored
    Similarly to 6525002, this allows to use routes helpers for mounted
    helpers, but this time in ActionView::TestCase
  2. @rafaelfranca
  3. @drogus

    Include routes.mounted_helpers into integration tests

    drogus authored
    In integration tests, you might want to use helpers from engines that
    you mounted in your application. It's not hard to add it by yourself,
    but it's unneeded boilerplate. mounted_helpers are now included by
    default. That means that given engine mounted like:
    
        mount Foo::Engine => "/foo", :as => "foo"
    
    you will be able to use paths from this engine in tests this way:
    
        foo.root_path #=> "/foo"
    
    (closes #6573)
Commits on May 31, 2012
  1. @tenderlove
Something went wrong with that request. Please try again.