Permalink
Commits on Oct 2, 2012
  1. Merge pull request #7708 from bdurand/optimize_log_subscribers

    Optimize log subscribers to check if the log level is sufficient
    rafaelfranca committed Oct 2, 2012
  2. Merge pull request #7794 from guilleiguaran/extract-rack-cache

    Use Rack::Cache middleware only if is in Gemfile
    spastorino committed Oct 2, 2012
  3. Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…

    …riables
    
    prefix TemplateAssertions ivars.
    
    Closes #7459
    rafaelfranca committed Oct 2, 2012
Commits on Oct 1, 2012
  1. Merge pull request #7789 from senny/7777_resource_functions_modify_op…

    …tions
    
    resource and resources do no longer modify passed options
    rafaelfranca committed Oct 1, 2012
  2. resource and resources do no longer modify passed options

    this is a patch for #7777.
    senny committed with senny Sep 29, 2012
  3. Merge pull request #7813 from arunagw/warning_fixed_as

    warning fixed: (...) interpreted as grouped expression
    rafaelfranca committed Oct 1, 2012
  4. Merge pull request #7812 from bdurand/optimize_cache_entry_take_2

    fix broken cache tests
    jeremy committed Oct 1, 2012
  5. fix broken cache tests

    Brian Durand committed Oct 1, 2012
  6. Merge pull request #7811 from iHiD/resource_generator_routes_master

    Fix the build (Broken scaffold routes test)
    spastorino committed Oct 1, 2012
  7. Fix broken scaffold routes test

    iHiD committed Oct 1, 2012
  8. Merge pull request #7810 from steveklabnik/fix_build

    fix cache store test
    jeremy committed Oct 1, 2012
  9. fix cache store test

    Pull #7800 broke the build, this should fix it.
    steveklabnik committed Oct 1, 2012
  10. Merge pull request #6450 from iHiD/resource_generator_routes_master

    Master branch: Fixed generated whitespace in routes when using namespaced resource.
    rafaelfranca committed Oct 1, 2012
Commits on Sep 30, 2012
  1. Add a changelog entry for asset aliasing update in sprockets-rails. S…

    …upports referencing foo.js as foo/index.js and vice versa.
    jeremy committed Sep 30, 2012
  2. Merge pull request #7808 from steveklabnik/fix_assertion_order

    Fix other assertions that were backwards.
    fxn committed Sep 30, 2012
  3. Fix other assertions that were backwards.

    This time I used ack.
    steveklabnik committed Sep 30, 2012
  4. Merge pull request #7805 from steveklabnik/fix_assertion_order

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

    steveklabnik committed Sep 30, 2012
  6. Merge branch 'optimize_log_subscribers' of github.com:bdurand/rails i…

    …nto optimize_log_subscribers
    Brian Durand committed Sep 30, 2012
  7. Optimize log subscribers to check if the log level is sufficient befo…

    …re performing an operations.
    Brian Durand committed Sep 19, 2012
  8. Merge pull request #7800 from bdurand/optimize_cache_entry_take_2

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

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

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

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

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

    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
    HugoLnx committed Apr 7, 2012
Commits on Sep 29, 2012
  1. small refactoring of build_relation in uniqueness

    reflection init as 'if' stantment.
    column is always the same expression and depends from the changing of attributes
    acapilleri committed Sep 29, 2012