Permalink
Commits on Nov 14, 2011
  1. Put sass-rails 3.1.5.rc.2 in the default Gemfile.

    Otherwise there will be dependency conflicts with sprockets.
    jonleighton committed Nov 14, 2011
  2. Merge pull request #3625 from guilleiguaran/sprockets-2.1.0

    Upgrade Sprockets to 2.1.0
    Conflicts:
    
    	actionpack/actionpack.gemspec
    jonleighton committed Nov 14, 2011
  3. Revert "Properly cache value when it is "false""

    This reverts commit 551f313.
    
    Reason: see
    #2010 (comment)
    jonleighton committed Nov 14, 2011
Commits on Nov 13, 2011
Commits on Nov 12, 2011
Commits on Nov 9, 2011
  1. Merge pull request #3576 from arunagw/changelog_changelog_md

    Changelog changelog md
    vijaydev committed Nov 9, 2011
  2. CHANGELOG to CHANGELOG.md

    arunagw committed Nov 9, 2011
Commits on Nov 8, 2011
  1. Replace example with SQL placeholder syntax.

    This works just fine, is less code, and reduces the risk of someone implementing a SQL injection vulnerability.
    tilsammans committed with vijaydev Nov 8, 2011
  2. self.up, self.down => up, down

    amatsuda committed with vijaydev Nov 7, 2011
  3. Merge pull request #3561 from bfolkens/3-1-stable-url_subdomain_with_…

    …numeric_host
    
    3 1 stable url subdomain with numeric host
    josevalim committed Nov 8, 2011
  4. Fix trouble using :subdomain in development environment when using nu…

    …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'
    bfolkens committed Nov 8, 2011
Commits on Nov 6, 2011
  1. Merge pull request #3521 from nulogy/fix_postgres_adapter_to_handle_s…

    …paces_between_schemas
    
    Fix postgres adapter to handle spaces between schemas
    tenderlove committed Nov 6, 2011
  2. Implement a workaround for a bug in ruby-1.9.3p0.

    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
    jonleighton committed Nov 6, 2011
  3. Merge pull request #3533 from kennyj/fix_3440-2

    Barckport to 3-1-stable: fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)
    jonleighton committed Nov 6, 2011
Commits on Nov 5, 2011
  1. Fixed after_initialize/after_find guide

    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)
    vijaydev committed Nov 5, 2011
  2. Added bundle exec to rake test.

    This is in response to rails/rails#3504.
    henrikhodne committed with vijaydev Nov 3, 2011
  3. Merge pull request #3528 from arunagw/doc_fix

    Doc fix
    fxn committed Nov 5, 2011
Commits on Nov 4, 2011
  1. fixes bug with PostgreSQLAdapter#indexes

    When the search path has multiple schemas, spaces were not being stripped
    from the schema names after the first.
    sskirby committed Nov 4, 2011
  2. Merge pull request #3518 from cesario/gemspec-3-1-stable

    Resynchronizing the gemspecs
    jonleighton committed Nov 4, 2011