Permalink
Commits on Sep 30, 2012
  1. Merge pull request #7805 from steveklabnik/fix_assertion_order

    fxn committed Sep 30, 2012
    fix order of assertions.
  2. fix order of assertions.

    steveklabnik committed Sep 30, 2012
  3. Merge pull request #7800 from bdurand/optimize_cache_entry_take_2

    fxn committed Sep 30, 2012
    Optimize ActiveSupport::Cache::Entry to reduce overhead
  4. Optimize ActiveSupport::Cache::Entry to reduce memory and processing …

    Brian Durand
    Brian Durand committed Sep 30, 2012
    …overhead.
  5. Merge pull request #7795 from guilleiguaran/fix-ap-changelog

    vijaydev committed Sep 30, 2012
    Fix changelog entry about sprockets-rails
  6. Merge pull request #7791 from acapilleri/build_association

    rafaelfranca committed Sep 30, 2012
    small refactoring of build_relation in uniqueness
  7. Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased

    rafaelfranca committed Sep 30, 2012
    REBASED: fixing assert_template bug when template matches expected, but not ends with
  8. `assert_template` no more passing with what ever string that matches.

    HugoLnx committed Apr 7, 2012
    Given Im rendering an template `/layout/hello.html.erb`, assert_template was
    passing with any string that matches. This behavior allowed false passing like:
    
    	assert_template "layout"
    	assert_template "out/hello"
    
    Now the passing possibilities are:
    
    	assert_template "layout/hello"
    	assert_template "hello"
    
    fixing assert_template bug when template matches expected, but not ends with
    
    Cherry Pick Merge: Fixes issue #3849 assert_template false positive
    
    taking redundant test off
    
    prevening incorrect assert_template when rendering with repeated names in path
    
    updating CHANGELOG with bugfix: assert_template false passing
Commits on Sep 29, 2012
  1. small refactoring of build_relation in uniqueness

    acapilleri committed Sep 29, 2012
    reflection init as 'if' stantment.
    column is always the same expression and depends from the changing of attributes
  2. Merge pull request #7784 from morgoth/proper_test_names_for_assertions

    rafaelfranca committed Sep 29, 2012
    Changed test names to match proper context
  3. Merge pull request #7787 from sferik/update_minitest

    jeremy committed Sep 29, 2012
    Update minitest dependency to ~> 4.0
Commits on Sep 28, 2012
  1. Merge pull request #7783 from guilleiguaran/namespace-assets-cache-store

    spastorino committed Sep 28, 2012
    Assets cache shouldn't be shared between different environments
  2. Merge pull request #7782 from yahonda/case_insensitive_test_for_parti…

    rafaelfranca committed Sep 28, 2012
    …al_inserts
    
    Change query pattern case insensitive
  3. Change query pattern case insensitive

    yahonda committed Sep 28, 2012
    because Oracle adapter uses upper case attribute/column name.
  4. Merge branch 'master' of github.com:lifo/docrails

    vijaydev committed Sep 28, 2012
    Conflicts:
    	actionpack/lib/action_view/helpers/asset_tag_helper.rb
  5. copy editing [ci skip]

    vijaydev committed Sep 28, 2012
  6. Revert "add documentation to generated routes"

    vijaydev committed Sep 28, 2012
    This reverts commit bfafa99.
    
    Changes in templates aren't allowed in docrails.
    
    [ci skip]
  7. Support for partial inserts.

    jonleighton committed Sep 28, 2012
    When inserting new records, only the fields which have been changed
    from the defaults will actually be included in the INSERT statement.
    The other fields will be populated by the database.
    
    This is more efficient, and also means that it will be safe to
    remove database columns without getting subsequent errors in running
    app processes (so long as the code in those processes doesn't
    contain any references to the removed column).
  8. Merge pull request #7776 from smartinez87/changelog_entry

    rafaelfranca committed Sep 28, 2012
    Add #update_columns entry to AR Changelog. [ci skip]
  9. Merge pull request #7394 from bobbyw/master

    rafaelfranca committed Sep 28, 2012
    Use template0 option for creating activerecord test databases in build_database task with postgres
  10. Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.foo(*arg…

    jonleighton committed Sep 28, 2012
    …s).deliver`.
    
    This makes it easy to write e.g. `Mailer.expects(:deliver_foo)` when
    testing code that calls the mailer.
  11. Merge pull request #7775 from frodsan/test_ap_metal

    rafaelfranca committed Sep 28, 2012
    move metal/caching_test into controller/caching_test
  12. move metal/caching_test into controller/caching_test

    Francesco Rodriguez
    Francesco Rodriguez committed Sep 28, 2012
Commits on Sep 27, 2012