Permalink
Switch branches/tags
Commits on Dec 16, 2014
  1. Merge pull request #18047 from JuanitoFatas/patch/constant_autoloadin…

    …g_and_reloading-list-items
    
    [ci skip] ✂️ blank lines between list items.
    seuros committed Dec 16, 2014
  2. decribe deprecation cycle from `timestamps null: false` to `null: true`.

    [ci skip]
    
    /cc @sgrif @zzak
    
    Conflicts:
    	activerecord/CHANGELOG.md
    senny committed Dec 16, 2014
  3. undoes a recent merged edit [ci skip]

    I think "What" is was fine, "The purpose of" assumes the reader knows such thing exists.
    "What is" is fine, and also matches the following "What is require_dependency".
    fxn committed Dec 16, 2014
  4. missing preposition [ci skip]

    fxn committed Dec 16, 2014
  5. Remove this tip, if the previous statement is true.. ie: The reader s…

    …ees "Rails
    
    4.2.0", then they should have no problems hacking with Rails. [ci skip]
    
    If they do, then its a bug and it should be reported.
    zzak committed Dec 16, 2014
  6. Merge pull request #17992 from andreynering/guides-intallation

    Improving tips about installation in the guides [ci skip]
    zzak committed Dec 16, 2014
  7. Merge branch 'patch-8' of https://github.com/jonatack/rails into jona…

    …tack-patch-8
    
    [ci skip]
    
    Conflicts:
    	guides/source/constant_autoloading_and_reloading.md
    zzak committed Dec 16, 2014
  8. Merge pull request #18046 from stephenminded/counter_cache_docs_fix

    Counter cache Rails guides fix
    arthurnn committed Dec 16, 2014
  9. Add CHANGELOG for #18034 [ci skip]

    zzak committed Dec 16, 2014
  10. Merge pull request #18034 from andreynering/ar-guides-querying

    Adding method chaining section on ActiveRecord querying guide [ci skip]
    zzak committed Dec 16, 2014
  11. Merge pull request #18040 from jonatack/patch-11

    Improve autoload_paths section [ci skip]
    zzak committed Dec 16, 2014
  12. You need to specify the counter_cache option on the has_many side of …

    …the association when using a custom counter cache column. This is documented on the has_many association here: http://apidock.com/rails/ActiveRecord/Associations/ClassMethods/has_many [ci skip]
    stephenminded committed Dec 16, 2014
  13. Merge pull request #18043 from claudiob/minor-autoloading-guides-fixes

    Minor typos/fixes to autoloading guide
    seuros committed Dec 16, 2014
  14. Minor typos/fixes to autoloading guide

    @fxn Great job with the guide, I read it all! Yeah!
    
    Some paragraphs might be restructured, but I'll leave that to you
    since you are currently working on it. This commit only includes
    some minor typos and commas that in my opinion clarify the reading.
    
    [ci skip]
    claudiob committed Dec 16, 2014
Commits on Dec 15, 2014
  1. Regression test for #18024

    spastorino committed Dec 15, 2014
  2. Revert "Re-enable capture'ing non-String values"

    This reverts commit c2fe093.
    spastorino committed Dec 15, 2014
  3. Merge pull request #16924 from Sinjo/params-deep-munge-empty-array

    Don't convert empty arrays to nils when deep munging params
    chancancode committed Dec 15, 2014
  4. Merge pull request #18041 from andreynering/ar-guides-querying-2

    Dynamic finders already deprecated [ci skip]
    rafaelfranca committed Dec 15, 2014
  5. Update constant_autoloading_and_reloading.md

    [skip ci]
    
    Follow-up to previous commit
    
    [skip ci]
    
    Fix previous merge
    
    [skip ci]
    jonatack committed with jonatack Dec 15, 2014
  6. Improve autoload_paths section

    [skip ci]
    jonatack committed Dec 15, 2014
  7. Merge pull request #18038 from seuros/typofix

    fix a typo [ci skip]
    rafaelfranca committed Dec 15, 2014
  8. fix a typo [ci skip]

    seuros committed Dec 15, 2014
  9. fix a typo [ci skip]

    vijaydev committed Dec 15, 2014
  10. Merge pull request #18026 from hbd225/fix_duplicate_web-console_entries

    Fix Duplicate web-console entries in Gemfile
    rafaelfranca committed Dec 15, 2014
  11. Merge pull request #18035 from claudiob/minor-typos-in-autoloading-guide

    Fix minor typos in autoloading guide [ci skip]
    rafaelfranca committed Dec 15, 2014