Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v3.1.2
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
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.
Commits on Nov 15, 2011
  1. @jonleighton

    Merge pull request #3633 from Juanmcuello/3-1-stable

    jonleighton authored
    Backport #3232 to 3-1-stable
Commits on Nov 14, 2011
  1. @jonleighton
  2. @jonleighton
  3. @jonleighton

    Put sass-rails 3.1.5.rc.2 in the default Gemfile.

    jonleighton authored
    Otherwise there will be dependency conflicts with sprockets.
  4. @jonleighton
  5. @jonleighton

    Merge pull request #3625 from guilleiguaran/sprockets-2.1.0

    jonleighton authored
    Upgrade Sprockets to 2.1.0
    Conflicts:
    
    	actionpack/actionpack.gemspec
  6. @jonleighton
  7. @jonleighton

    Revert "Properly cache value when it is "false""

    jonleighton authored
    This reverts commit 551f313.
    
    Reason: see
    #2010 (comment)
Commits on Nov 13, 2011
  1. @avakhov @vijaydev

    Cosmetic fix in number_to_currency docs

    avakhov authored vijaydev committed
  2. @byroot @vijaydev

    Fix a tiny typo in custom validators documentation

    byroot authored vijaydev committed
Commits on Nov 12, 2011
  1. @hasclass @vijaydev

    Properly cache value when it is "false"

    hasclass authored vijaydev committed
Commits on Nov 9, 2011
  1. @vijaydev

    Merge pull request #3576 from arunagw/changelog_changelog_md

    vijaydev authored
    Changelog changelog md
  2. @arunagw

    CHANGELOG to CHANGELOG.md

    arunagw authored
Commits on Nov 8, 2011
  1. @tilsammans @vijaydev

    Replace example with SQL placeholder syntax.

    tilsammans authored vijaydev committed
    This works just fine, is less code, and reduces the risk of someone implementing a SQL injection vulnerability.
  2. @avakhov @vijaydev

    Fix small typo in link_to_function doc

    avakhov authored vijaydev committed
  3. @amatsuda @vijaydev
  4. @amatsuda @vijaydev

    self.up, self.down => up, down

    amatsuda authored vijaydev committed
  5. @dalibor @vijaydev

    Fixed stale doc in AbstractController::Layouts

    dalibor authored vijaydev committed
  6. @josevalim

    Merge pull request #3561 from bfolkens/3-1-stable-url_subdomain_with_…

    josevalim authored
    …numeric_host
    
    3 1 stable url subdomain with numeric host
  7. @bfolkens
  8. @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. @tenderlove

    Merge pull request #3521 from nulogy/fix_postgres_adapter_to_handle_s…

    tenderlove authored
    …paces_between_schemas
    
    Fix postgres adapter to handle spaces between schemas
  3. @jonleighton
  4. @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
  5. @jonleighton

    Merge pull request #3533 from kennyj/fix_3440-2

    jonleighton authored
    Barckport to 3-1-stable: fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)
Commits on Nov 5, 2011
  1. @kennyj
  2. @vijaydev

    Fixed after_initialize/after_find guide

    vijaydev authored
    Defining after_initialize and after_find as ordinary methods like
    documented in the guide doesn't work with Rails 3.1.1; now macro-style
    is used here, too.
    
    Conflicted while cherry picking from master (Original Author: Florian Walch)
  3. @avakhov @vijaydev

    Fix javascript_include_tag examples in documentation

    avakhov authored vijaydev committed
  4. @henrikhodne @vijaydev

    Added bundle exec to rake test.

    henrikhodne authored vijaydev committed
    This is in response to rails/rails#3504.
  5. @radar @vijaydev

    [config guide] mention that config methods are to be called on Railti…

    radar authored vijaydev committed
    …e subclasses
  6. @avakhov @vijaydev

    Fix typo in constraints method documentation

    avakhov authored vijaydev committed
Something went wrong with that request. Please try again.