Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 3, 2012
  1. @spastorino

    Bump to 3.2.8.rc2

    spastorino authored
Commits on Aug 1, 2012
  1. @spastorino

    Bump to 3.2.8.rc1

    spastorino authored
  2. @rafaelfranca
  3. @rafaelfranca

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

    rafaelfranca authored
    This reverts commit 1aff772.
    
    Conflicts:
    	actionpack/CHANGELOG.md
  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.
Commits on Jul 27, 2012
  1. @fxn

    adds a missing require from Active Support

    fxn authored
    This file uses mattr_accessor.
Commits on Jul 26, 2012
  1. @tenderlove

    bumping to 3.2.7

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

    updating the version

    tenderlove authored
Commits on Jul 17, 2012
  1. @pixeltrix

    Add support for optional root segments containing slashes

    pixeltrix authored
    Optional segments with a root scope need to have the leading slash
    outside of the parentheses, otherwise the generated url will be empty.
    However if the route has non-optional elements then the leading slash
    needs to remain inside the parentheses otherwise the generated url
    will have two leading slashes, e.g:
    
    Blog::Application.routes.draw do
      get '/(:category)', :to => 'posts#index', :as => :root
      get '/(:category)/author/:name', :to => 'posts#author', :as => :author
    end
    
    $ rake routes
      root GET /(:category)(.:format)              posts#index
    author GET (/:category)/author/:name(.:format) posts#author
    
    This change adds support for optional segments that contain a slash,
    allowing support for urls like /page/2 for the root path, e.g:
    
    Blog::Application.routes.draw do
      get '/(page/:page)', :to => 'posts#index', :as => :root
    end
    
    $ rake routes
    root GET /(page/:page)(.:format) posts#index
    
    Fixes #7073
    (cherry picked from commit d8745de)
Commits on Jul 10, 2012
  1. Fixed bug creating invalid HTML in select options

    Rusty Geldmacher authored
    When a select tag is created for a field with errors, and that select
    tag has :prompt or :include_blank options, then the inserted first
    option will errantly have a <div class="field_with_errors"> wrapping
    it.
    
    See #7017
Commits on Jul 5, 2012
  1. @route

    Show in log correct wrapped keys

    route authored
Commits on Jul 3, 2012
  1. @mjtko @carlosantoniodasilva

    Fix NumberHelper options wrapping to prevent verbatim blocks being re…

    mjtko authored carlosantoniodasilva committed
    …ndered instead of line continuations. While I'm at it, wrap long comment lines consistently.
    
    Conflicts:
    	actionpack/lib/action_view/helpers/number_helper.rb
    
    There was just one conflict related to the addition of the :format
    option to number_to_percentage.
Commits on Jun 19, 2012
  1. @carlosantoniodasilva

    Merge pull request #6649 from route/logger_in_metal_3_2

    carlosantoniodasilva authored
    Logger in metal backport for 3.2
Commits on Jun 16, 2012
  1. @rafaelfranca

    Merge pull request #6752 from steveklabnik/fix_5680

    rafaelfranca authored
    Respect absolute paths in compute_source_path.
Commits on Jun 15, 2012
  1. @route
Commits on Jun 13, 2012
  1. @spastorino
Commits on Jun 11, 2012
  1. @tenderlove

    bumping version numbers

    tenderlove authored
  2. @tenderlove
Commits on Jun 7, 2012
  1. @drogus

    Fix railties test suite

    drogus authored
    Apparently asset_environment should not be invoked if it's not needed.
    This fixes broken build by getting back to the code more similar to the
    version changed here: 5b0a891
  2. @drogus

    Fix asset tags for files with more than one dot

    drogus authored
    After the fix done in 39f9f02, there are cases that will not work
    correctly. If you have file with "2 extensions", like foo.min.js and you
    reference the file without extension, like:
    
        javascript_include_tag "foo.min"
    
    it will fail because sprockets finds foo.min.js with foo.min argument.
    
    This commit fixes this case and will get the right file even when
    referrencing it without extension.
    
    (closes #6598)
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).
  2. @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. @josevalim

    Merge pull request #6588 from nbibler/polymorphic_to_model

    josevalim authored
    Correct the use of to_model in polymorphic routing
  3. @nbibler
  4. @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)
  5. @tenderlove

    bumping to 3.2.5

    tenderlove authored
Commits on May 31, 2012
  1. @tenderlove

    bumping to 3.2.4

    tenderlove authored
Commits on May 30, 2012
  1. @tenderlove

    Strip [nil] from parameters hash.

    tenderlove authored
    Thanks to Ben Murphy for reporting this!
    
    CVE-2012-2660
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.2.4.rc1

    tenderlove authored
Commits on May 26, 2012
  1. @bdurand @pwim

    remove unnecessary memcache equire in ActionDispatch::Session::CacheS…

    bdurand authored pwim committed
    …tore
Commits on May 21, 2012
  1. @lest

    Assets: don't add extension if other given and file exists

    lest authored
    We should lookup if asset without appended extension exists.
    When sprockets are disabled the asset tag helpers incorporate
    this logic. When sprockets are enabled we should have the same
    logic.
    
    For example, we have style.ext file in app/assets/stylesheets and
    we use stylesheet_link_tag in the layout. In this case we should
    have /assets/style.ext instead of /assets/style.ext.css in the
    output.
    
    Closes #6310
Commits on May 20, 2012
  1. @rafaelfranca

    Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable

    rafaelfranca authored
    TagHelper creates invalid data attributes when value is a BigDecimal
  2. @josevalim

    Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806…

    josevalim authored
    …f7b028614c
    
    Template concurrency fixes
Something went wrong with that request. Please try again.