Commits on Dec 4, 2012
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

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

    Updated 4.0 release notes

    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]
    vijaydev committed Dec 4, 2012
  3. @vijaydev

    copy edits [ci skip]

    vijaydev committed Dec 4, 2012
  4. @rafaelfranca

    Merge pull request #8416 from kennyj/redundant_pg_namespace

    pg_namespace table isn't used.
    rafaelfranca committed Dec 4, 2012
  5. @vijaydev

    Revert "Add documentation to TransactionIsolationError [ci skip]"

    This reverts commit 5ff5970.
    
    Reason: Seems dubious and adds less value.
    
    [ci skip]
    vijaydev committed Dec 4, 2012
  6. @kennyj

    pg_namespace table isn't used.

    kennyj committed Dec 5, 2012
  7. @dhh
  8. @maurafitz @pixeltrix

    Fixed issue where routes with globs caused constraints on that glob to

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

    Merge pull request #8403 from senny/3313_after_find_is_triggered_too_…

    …often
    
    Do not instantiate intermediate AR objects when eager loading.
    rafaelfranca committed Dec 4, 2012
  10. @senny @senny

    Do not instantiate intermediate AR objects when eager loading.

    Closes #3313
    senny committed with senny Dec 2, 2012
  11. @jeremy
  12. @rafaelfranca

    Merge pull request #8411 from YasuOza/turbolinks_require_bottom

    Locate `=require turbolinks` at the bottom of application.js
    rafaelfranca committed Dec 3, 2012
  13. @yasuoza

    Locate `=require turbolinks` at the bottom of application.js

    Turbolinks should be located at the bottom of application.js
    to detect assets change properly.
    yasuoza committed Dec 4, 2012
  14. @carlosantoniodasilva

    Merge pull request #8393 from frodsan/fix_dependend_order_test_example

    Ensure original encoding does not change in mb_chars test.
    carlosantoniodasilva committed Dec 3, 2012
Commits on Dec 3, 2012
  1. @carlosantoniodasilva

    Use send in Time marshal extensions since the methods are now private

    See ruby/ruby@9c1b316
    
    All Active Support tests pass in 2.0.0preview2 after this change.
    Closes #8409
    carlosantoniodasilva committed Dec 3, 2012
  2. @byroot
  3. @jeremy

    Override <%== to always behave as literal text rather than toggling b…

    …ased on whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged.
    jeremy committed Dec 3, 2012
  4. @rafaelfranca

    Merge pull request #8407 from kennyj/fix_profiler_comments

    Fix wrong doc and message about rails profiler.
    rafaelfranca committed Dec 3, 2012
  5. @kennyj
  6. @1334

    fix some formatting

    1334 committed Dec 3, 2012
  7. @rafaelfranca
  8. @carlosantoniodasilva

    Fix failing tests related to rake notes

    Related to changes introduced in 553b563
    carlosantoniodasilva committed Dec 3, 2012
  9. @fxn

    Merge pull request #8375 from steveklabnik/migrations_guide

    Updates to the Migration Guide
    fxn committed Dec 3, 2012
  10. @htanata

    Fix typo.

    htanata committed Dec 3, 2012
  11. @matthewrobertson
  12. @matthewrobertson
  13. added full file path in all file references

    It's really comfy being able to copy-paste the file paths.
    
    I suppose there's also some benefit in trying to figure out the file name as a small exercise, but I don't think that sort of thing belongs in "Getting Started".
    Yoni Yalovitsky committed Dec 3, 2012
  14. removed an extra slash before the 'app' dir

    Yoni Yalovitsky committed Dec 3, 2012
Commits on Dec 2, 2012
  1. @ptn
  2. @ptn
  3. @ptn
  4. @ptn
  5. @ptn

    Correct grammar [ci skip]

    ptn committed Dec 2, 2012
  6. @ptn
  7. @ptn