Permalink
Switch branches/tags
Commits on Dec 6, 2012
  1. Merge pull request #8440 from steveklabnik/master

    CHANGELOG for 78d5d6f
    
    [ci skip]
    rafaelfranca committed Dec 6, 2012
  2. CHANGELOG for 78d5d6f.

    It was pointed out by @giner that the CHANGELOG entry for 78d5d6f
    wasn't included. Here it is.
    steveklabnik committed Dec 6, 2012
  3. Merge pull request #8439 from joshsusser/fixes

    Fixes issues in test_mysql2
    carlosantoniodasilva committed Dec 6, 2012
  4. Invert precedence of content in ActionDispatch::Static

    This commit inverts the precedence in ActionDispatch::Static so that
    dynamic content will be served before static content. This is so that
    precompiled assets do not inadvertently get included when running in
    development mode - it should have no effect in production where static
    files are usually handled by the web server.
    
    Closes #6421
    pixeltrix committed Dec 6, 2012
  5. convert time to string

    why is this a Time to start with?
    joshsusser committed Dec 6, 2012
  6. Refactor tests that switch RAILS_ENV and RACK_ENV

    This cleanup aims to fix a build failure:
    https://travis-ci.org/rails/rails/jobs/3515951/#L482
    
    Since travis always have both ENV vars set to "test", a test is failing
    where it's expected to output the default env "development", but "test"
    is the result due to RACK_ENV being set when we expect it to not be.
    
    By cleaning this duplication we ensure that changing any of these env
    variables will pick the right expected value.
    carlosantoniodasilva committed Dec 6, 2012
  7. Add comment about implementation of class_attribute

    To prevent future pull requests like #8435 add a comment about the
    implementation of class_attribute using class_eval for performance.
    
    [ci skip]
    pixeltrix committed Dec 6, 2012
Commits on Dec 5, 2012
  1. Merge pull request #8431 from joshsusser/schemadump

    dump schema.rb without :version option
    tenderlove committed Dec 5, 2012
  2. Merge branch 'joshsusser-master' into merge

    * joshsusser-master:
      style cleanup
      Add migration history to schema.rb dump
      Add metadata to schema_migrations
    
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/schema.rb
    tenderlove committed Dec 5, 2012
  3. Merge pull request #8429 from reednj77/turbolinks-js-include-order

    Revert turbolinks load order requirement
    carlosantoniodasilva committed Dec 5, 2012
  4. Fix duplicated method name

    [ci skip]
    carlosantoniodasilva committed Dec 5, 2012
  5. Merge pull request #8427 from kennyj/support_rack_env

    Add ENV['RACK_ENV'] support to rake runner/console/server.
    rafaelfranca committed Dec 5, 2012
  6. Merge pull request #8424 from kennyj/tiny_fixes_20121206

    fix warning: possibly useless use of a constant in void context
    fxn committed Dec 5, 2012
  7. Merge pull request #8371 from freegenie/5396-conditional-fragment-cac…

    …hing
    
    Allow fragment cache to accept :if and :unless options.
    
    Closes #5396
    rafaelfranca committed Dec 5, 2012
  8. Allow fragment cache to accept :if and :unless options

    [Stephen Ausman + Fabrizio Regini]
    freegenie committed Nov 29, 2012
  9. Merge pull request #8412 from JoeyButler/action_dispatch_routing_mapp…

    …er_refactoring
    
    Extract method refactoring.
    rafaelfranca committed Dec 5, 2012
  10. Extract method refactoring in ActionDispatch::Routing::SingletonResou…

    …rce.
    Joey Butler committed Dec 4, 2012
  11. Merge pull request #8421 from claudiob/remove_unicode_blanks

    Replace comments' non-breaking spaces with spaces [ci skip]
    carlosantoniodasilva committed Dec 5, 2012
  12. Replace comments' non-breaking spaces with spaces

    Sometimes, on Mac OS X, programmers accidentally press Option+Space
    rather than just Space and don’t see the difference. The problem is
    that Option+Space writes a non-breaking space (0XA0) rather than a
    normal space (0x20).
    
    This commit removes all the non-breaking spaces inadvertently
    introduced in the comments of the code.
    claudiob committed Dec 5, 2012
Commits on Dec 4, 2012
  1. Fix Active Record validation error messages markup in guides

    The other way it was not marking the text as italic, it was showing the
    underlines as normal text.
    
    Also fixes some code examples indentation and # => marks in Active Model
    and Active Record guides.
    
    [ci skip]
    carlosantoniodasilva committed Dec 4, 2012
  2. Merge pull request #8418 from ershad/master

    Fixing a spelling mistake [ci skip]
    carlosantoniodasilva committed Dec 4, 2012
  3. Merge pull request #8417 from kennyj/fix_8414

    Fix #8414. Performance problem with postgresql adapter primary_key function.
    rafaelfranca committed Dec 4, 2012
  4. Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	guides/source/migrations.md
    vijaydev committed Dec 4, 2012