Permalink
Commits on Dec 6, 2012
  1. Refactor tests that switch RAILS_ENV and RACK_ENV

    carlosantoniodasilva committed Dec 6, 2012
    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.
  2. Add comment about implementation of class_attribute

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

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

    tenderlove committed Dec 5, 2012
    * 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
  3. Merge pull request #8429 from reednj77/turbolinks-js-include-order

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

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

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

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

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

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

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

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

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

    claudiob committed Dec 5, 2012
    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.
Commits on Dec 4, 2012
  1. Fix Active Record validation error messages markup in guides

    carlosantoniodasilva committed Dec 4, 2012
    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]
  2. Merge pull request #8418 from ershad/master

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

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

    vijaydev committed Dec 4, 2012
    Conflicts:
    	guides/source/migrations.md
  5. Updated 4.0 release notes

    vijaydev committed Dec 4, 2012
    The release notes is changed to include only the major changes and point
    to the changelogs for the complete list. This lets us talk more about the
    features included in the upcoming release and make the guide more useful
    and interesting than just a list of all changelogs.
    
    This is still a WIP guide pending a lot of work.
    
    [ci skip]
  6. copy edits [ci skip]

    vijaydev committed Dec 4, 2012
  7. Merge pull request #8416 from kennyj/redundant_pg_namespace

    rafaelfranca committed Dec 4, 2012
    pg_namespace table isn't used.
  8. Revert "Add documentation to TransactionIsolationError [ci skip]"

    vijaydev committed Dec 4, 2012
    This reverts commit 5ff5970.
    
    Reason: Seems dubious and adds less value.
    
    [ci skip]
  9. Fixed issue where routes with globs caused constraints on that glob to

    maurafitz authored and pixeltrix committed Nov 2, 2012
    be ignored. A regular expression constraint gets overwritten when the
    routes.rb file is processed. Changed the overwriting to an ||= instead
    of an = assignment.