Commits on Oct 12, 2012
  1. @josevalim

    Merge pull request #7917 from dfens/master

    Cosmetic changes: remove trailing whitespaces from tests
    josevalim committed Oct 12, 2012
  2. @dfens

    Cleanup trailing whitespaces

    dfens committed Oct 12, 2012
  3. @rafaelfranca

    Merge pull request #7915 from frodsan/docs_permit

    update AC::Parameters#permit documentation [ci skip]
    rafaelfranca committed Oct 11, 2012
  4. update AC::Parameters#permit documentation [ci skip]

    bdd105d changes the behaviour of AC::Parameters#permit.
    Francesco Rodriguez committed Oct 11, 2012
  5. @spastorino

    When executing permit with just a key that points to a hash, DO NOT a…

    …llow all the hash
    
    params.require(:person).permit(:projects_attributes) was returning
    => {"projects_attributes"=>{"0"=>{"name"=>"Project 1"}}}
    
    When should return
    => {}
    
    You should be doing ...
    params.require(:person).permit(projects_attributes: :name)
    to get just the projects attributes you want to allow
    spastorino committed Oct 12, 2012
  6. @tenderlove

    adding a test for b21f24d

    tenderlove committed Oct 11, 2012
Commits on Oct 11, 2012
  1. @rafaelfranca

    Merge pull request #7912 from mrship/master

    CacheDigests: Support templates in directories several levels deep
    rafaelfranca committed Oct 11, 2012
  2. @mrship
  3. @rafaelfranca

    Merge pull request #7886 from senny/3675_assert_template_twice_agains…

    …t_same_partial
    
    assert_template works when the same partial was rendered multiple times
    rafaelfranca committed Oct 11, 2012
  4. @rafaelfranca

    Merge pull request #7908 from arunagw/build_fix_railties

    No need to test for rack-cache present in gem file
    rafaelfranca committed Oct 11, 2012
  5. @senny @senny

    refactor `ActionView::TestCase` internals to track rendered locals

    this refactoring extracts the semi complex data structure of rendered locals
    per view into into a separate class
    senny committed with senny Oct 9, 2012
  6. @senny @senny
  7. @arunagw

    No need to test for rack-cache present in Gemfile

    as it's removed here 
    1fc7954
    arunagw committed Oct 11, 2012
  8. @vijaydev

    Merge pull request #7050 from kytrinyx/documentation-reset-column-info

    Expand the caveat about models in migrations in the rails guide.
    vijaydev committed Oct 10, 2012
  9. @rafaelfranca

    Merge pull request #7904 from jfirebaugh/eager_autoload

    Eager autoload Preloader classes
    rafaelfranca committed Oct 10, 2012
Commits on Oct 10, 2012
  1. @jfirebaugh

    Eager autoload Preloader classes

    Without eager autoloading, these would be autoloaded
    only when #preloader_for is called, which is too late
    in threaded applications.
    jfirebaugh committed Oct 10, 2012
  2. @jeremy

    Remove the leading :: constant qualifier in the ActiveRecord::Fixture…

    …s deprecation message
    jeremy committed Oct 10, 2012
  3. @jeremy

    Upgrade to a jquery-rails that doesn't expect config.action_view.java…

    …script_expansions to exist
    jeremy committed Oct 10, 2012
  4. @kytrinyx

    Expand caveat about models in migrations (rails guide)

    This is an attempt to address issue #6939, where an earlier migration
    added a column to the database, and a later migration uses a model and
    references that column.
    
    When both migrations were run together with `rake db:migrate` the column
    information in memory still referenced the old table structure.
    
    Running the migrations separately fixed this, as a new connection was
    then established before referencing the model. Explicitly calling
    `reset_column_information` is a more reliable workaround.
    kytrinyx committed Jul 13, 2012
  5. @vijaydev

    Merge pull request #7887 from senny/remove_unused_requires_in_ar_tests

    remove duplicated require statements in AR test cases
    vijaydev committed Oct 10, 2012
  6. @vijaydev

    Fixing build failures

    Build failed with an error "invalid multibyte char (US-ASCII)" in these
    files. Apparently, some UTF-8 char disguised as whitespace causes this.
    
    Thanks @rafaelfranca
    vijaydev committed Oct 11, 2012
  7. @vijaydev

    Merge pull request #7898 from olivierlacan/pg_homebrew_instructions

    Offer instructions for pg gem when installed via Homebrew
    vijaydev committed Oct 10, 2012
  8. @vijaydev

    Merge pull request #7890 from AvnerCohen/new_hash_syntax

    Moving to new hash syntax
    vijaydev committed Oct 10, 2012
  9. @vijaydev

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

    Conflicts:
    	activerecord/lib/active_record/persistence.rb
    	railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
    vijaydev committed Oct 11, 2012
  10. @vijaydev

    fix github url [ci skip]

    vijaydev committed Oct 11, 2012
  11. @vijaydev

    copy edits [ci skip]

    vijaydev committed Oct 11, 2012
  12. @vijaydev
  13. @vijaydev

    Revert "Fix Example in active model attribute methods"

    This reverts commit 1c02b98.
    vijaydev committed Oct 11, 2012
  14. @vijaydev
  15. @dhh

    Merge pull request #7902 from josh/fix-bug-in-as-cache-upgrade

    Fix AS::Cache version upgrading bug
    dhh committed Oct 10, 2012
  16. @josh

    Ensure expires_in and created_at timestamps aren't nil when attemptin…

    …g to upgrade cache
    josh committed Oct 10, 2012
  17. @dhh
  18. @dhh
  19. @dhh

    Merge pull request #7900 from josh/kill-old-asset-tag-helper-concat

    Remove old asset tag concatenation
    dhh committed Oct 10, 2012
  20. @josh

    Remove expansion config

    josh committed Oct 10, 2012