Skip to content
Commits on Dec 4, 2012
  1. @jeremy
  2. @rafaelfranca

    Merge pull request #8411 from YasuOza/turbolinks_require_bottom

    Locate `=require turbolinks` at the bottom of application.js
    rafaelfranca committed Dec 3, 2012
  3. @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
  4. @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. @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
  3. @rafaelfranca

    Merge pull request #8407 from kennyj/fix_profiler_comments

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

    Fix failing tests related to rake notes

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

    Merge pull request #8375 from steveklabnik/migrations_guide

    Updates to the Migration Guide
    fxn committed Dec 3, 2012
Commits on Dec 2, 2012
  1. @rafaelfranca

    Merge pull request #8402 from senny/8376_descriptive_error_message_fo…

    …r_partial_layout_true
    
    More descriptive error when rendering a partial with `:layout => true`
    rafaelfranca committed Dec 2, 2012
  2. @senny
  3. @rafaelfranca

    Merge pull request #8394 from acangiano/add_db_folder_to_annotations

    Add db to the list of default annotation folders
    rafaelfranca committed Dec 1, 2012
  4. @rafaelfranca

    Merge pull request #8398 from rmascarenhas/active-model-errors-spec-f…

    …ixes
    
    ActiveModel::Errors spec fixes
    rafaelfranca committed Dec 1, 2012
  5. @rmascarenhas
  6. @rmascarenhas
Commits on Dec 1, 2012
  1. @rafaelfranca

    Merge pull request #8397 from mmb/gitignore_global_home

    Quote ~ in git config global excludes command.
    rafaelfranca committed Dec 1, 2012
  2. @mmb

    Quote ~ in git config global excludes command.

    This will put ~/ in .gitconfig so it will not be hardcoded to the home
    directory where the command was run.
    mmb committed Dec 1, 2012
  3. @pixeltrix

    Only take the date parts from Time.zone.now

    When there are missing components in the Hash returned by
    Date._parse only the date components should default to the
    value of Time.zone.now, the time components should all
    default to zero.
    pixeltrix committed Dec 1, 2012
  4. ensure original encoding doesnt change

    Francesco Rodriguez committed Dec 1, 2012
  5. @acangiano
  6. @vijaydev

    Merge pull request #8382 from asanghi/mailerguide

    Add Mailer Callback section to Mailer guides
    vijaydev committed Dec 1, 2012
  7. @asanghi
  8. @carlosantoniodasilva
  9. @rafaelfranca

    Merge pull request #8391 from rmascarenhas/reset-attribute-doesnt-cha…

    …nge-it
    
    Reset attributes should not report changes.
    rafaelfranca committed Dec 1, 2012
  10. @rmascarenhas

    Reset attributes should not report changes.

    When resetting an attribute, you expect it to return to the state it was
    before any changes. Namely, this fixes this unexpected behavior:
    
    ~~~ruby
    model.name = "Bob"
    model.reset_name!
    model.name_changed? #=> true
    ~~~
    rmascarenhas committed Dec 1, 2012
  11. @steveklabnik

    Migration Guide: General fix-up

    This introduces a bunch of editing/re-writing to the migrations guide.
    There were a bunch of small changes, and a few larger ones:
    
    * mysql does support transactions.
    * Add a section about db/seeds.rb
    * Largely re-wrote the first few sections
    steveklabnik committed Nov 29, 2012
  12. @vijaydev

    Merge pull request #8379 from steveklabnik/validations_guide

    Validations guide
    vijaydev committed Dec 1, 2012
  13. @steveklabnik

    Here's a few updates to the validations guide. A bunch of small changes,

    plus:
    
    * 80 column formats
    * replacing the explanation of the dynamic_form gem with the example
      HTML/CSS that Rails scaffolds generate.
    steveklabnik committed Nov 29, 2012
  14. @vijaydev

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

    Conflicts:
    	guides/source/active_record_validations.md
    vijaydev committed Dec 1, 2012
  15. @vijaydev

    copy edits [ci skip]

    vijaydev committed Dec 1, 2012
  16. Fix Calculations#pluck doc to mention several attributes can be selec…

    …ted [ci skip]
    Florent Guilleux committed Dec 1, 2012
  17. @carlosantoniodasilva
  18. @fxn

    copy-edits the docs of 9ee0ffb

    fxn committed Dec 1, 2012
Something went wrong with that request. Please try again.