Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 20, 2011
  1. @jonleighton
Commits on Nov 19, 2011
  1. @jonleighton

    Don't html-escape the :count option to translate if it's a Numeric. F…

    jonleighton authored
    …ixes #3685.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md
  2. @jonleighton
Commits on Nov 18, 2011
  1. @jonleighton
Commits on Nov 17, 2011
  1. @lest @jonleighton

    _html translation should escape interpolated arguments

    lest authored jonleighton committed
  2. @lest @jonleighton

    _html translation should escape interpolated arguments

    lest authored jonleighton committed
  3. @wildchild
Commits on Nov 16, 2011
  1. @jonleighton

    Switch from marshal format to plain text for the encoding conversions…

    jonleighton authored
    … dump. This is for windows compatibility. Fixes #3644.
  2. @jonleighton

    Switch from marshal format to plain text for the encoding conversions…

    jonleighton authored
    … dump. This is for windows compatibility. Fixes #3644.
Commits on Nov 14, 2011
  1. @jonleighton
  2. @jonleighton
Commits on Nov 13, 2011
  1. @avakhov @vijaydev

    Cosmetic fix in number_to_currency docs

    avakhov authored vijaydev committed
Commits on Nov 8, 2011
  1. @avakhov @vijaydev

    Fix small typo in link_to_function doc

    avakhov authored vijaydev committed
  2. @dalibor @vijaydev

    Fixed stale doc in AbstractController::Layouts

    dalibor authored vijaydev committed
  3. @bfolkens
  4. @bfolkens

    Fix trouble using :subdomain in development environment when using nu…

    bfolkens authored
    …meric addresses.
    
    Otherwise the following occurs:
    
    TypeError: can't convert nil into String
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'
Commits on Nov 6, 2011
  1. @avakhov @vijaydev

    Docs cosmetic fixes in Action View form_helper.rb

    avakhov authored vijaydev committed
  2. @jonleighton
  3. @jonleighton

    Implement a workaround for a bug in ruby-1.9.3p0.

    jonleighton authored
    The bug is that an error would be raised while attempting to convert a
    template from one encoding to another.
    
    Please see http://redmine.ruby-lang.org/issues/5564 for more details.
    
    The workaround is to load all conversions into memory ahead of time,
    and will only happen if the ruby version is *exactly* 1.9.3p0. The
    hope is obviously that the underlying problem will be resolved in
    the next patchlevel release of 1.9.3.
    
    Conflicts:
    
    	actionpack/CHANGELOG.md
Commits on Nov 5, 2011
  1. @avakhov @vijaydev

    Fix javascript_include_tag examples in documentation

    avakhov authored vijaydev committed
  2. @avakhov @vijaydev

    Fix typo in constraints method documentation

    avakhov authored vijaydev committed
Commits on Nov 1, 2011
  1. @spastorino

    Merge pull request #1796 from jdeseno/master

    spastorino authored
    link_to doesn't allow rel attribute when also specifying method
Commits on Oct 31, 2011
  1. @tenderlove
  2. @cmeiklejohn @tenderlove

    Ensure that the format isn't applied twice to the cache key, else it …

    cmeiklejohn authored tenderlove committed
    …becomes impossible to target with expire_action.
Commits on Oct 30, 2011
  1. @mjy @vijaydev

    Adds missing closing regex slashes.

    mjy authored vijaydev committed
Commits on Oct 20, 2011
  1. @avakhov @vijaydev

    HTMl -> HTML: html scanner comment fix

    avakhov authored vijaydev committed
Commits on Oct 14, 2011
  1. @amatsuda @vijaydev

    status is a number in Rails 3

    amatsuda authored vijaydev committed
  2. @avakhov @vijaydev

    Add ActionController#head example

    avakhov authored vijaydev committed
Commits on Oct 12, 2011
  1. @josevalim
  2. @bzanchet @josevalim

    swallow error when can't unmarshall object from session

    bzanchet authored josevalim committed
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Oct 9, 2011
  1. @avakhov @vijaydev

    Fix params hash example in AC::Base comment

    avakhov authored vijaydev committed
Commits on Oct 7, 2011
  1. @spastorino

    Bumping to 3.1.1

    spastorino authored
Commits on Oct 6, 2011
  1. @spastorino

    Bumping to 3.1.1.rc3

    spastorino authored
Commits on Oct 5, 2011
  1. @spastorino

    stylesheet_link_tag('/stylesheets/application') and similar helpers d…

    spastorino authored
    …oesn't throw Sprockets::FileOutsidePaths exception anymore
  2. @avakhov @vijaydev
Something went wrong with that request. Please try again.