Permalink
Commits on Oct 4, 2012
  1. Merge pull request #6978 from frodsan/count_nosql_unsaved_parent

    rafaelfranca committed Oct 4, 2012
    Count returns 0 without querying if parent is not saved
Commits on Oct 3, 2012
  1. Merge pull request #7836 from lihanli/error-msg-update

    rafaelfranca committed Oct 3, 2012
    Update supported ruby versions error message in ruby_version_check.rb
  2. Refactor

    spastorino committed with rafaelfranca Oct 3, 2012
    Conflicts:
    	activerecord/lib/active_record/counter_cache.rb
Commits on Oct 2, 2012
  1. Merge pull request #7822 from lulalala/reset-counter-cache-for-has-ma…

    rafaelfranca committed Oct 2, 2012
    …ny-through
    
    Fix reset_counters crashing on has_many :through associations.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
  2. Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…

    rafaelfranca committed Oct 2, 2012
    …riables
    
    prefix TemplateAssertions ivars.
    
    Closes #7459
    Conflicts:
    	actionpack/lib/action_controller/test_case.rb
    	actionpack/lib/action_view/test_case.rb
Commits on Oct 1, 2012
  1. Merge pull request #7789 from senny/7777_resource_functions_modify_op…

    rafaelfranca committed Oct 1, 2012
    …tions
    
    resource and resources do no longer modify passed options
  2. Merge pull request #6450 from iHiD/resource_generator_routes_master

    rafaelfranca committed Oct 1, 2012
    Master branch: Fixed generated whitespace in routes when using namespaced resource.
    
    Merge pull request #7811 from iHiD/resource_generator_routes_master
    
    Fix the build (Broken scaffold routes test)
Commits on Sep 30, 2012
  1. Asset manifest includes aliases for foo.js -> foo/index.js and vice v…

    jeremy committed Sep 30, 2012
    …ersa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
  2. Merge pull request #7802 from steveklabnik/issue_7799

    fxn committed Sep 30, 2012
    Fix reference to code sample in Getting Started.
  3. 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
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/test_case.rb
Commits on Sep 29, 2012
  1. Merge pull request #7786 from yabawock/3-2-stable

    rafaelfranca committed Sep 29, 2012
    Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
  2. Don't paramify ActionDispatch::Http::UploadedFile in tests

    Tim Vandecasteele committed with mjonuschat Jun 21, 2012
    To test uploading a file without using fixture_file_upload, a posted
    ActionDispatch::Http::UploadedFile should not be paramified (just like
    Rack::Test::UploadedFile).
    (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't
    share the same API, tempfile is not accessible on
    Rack::Test::UploadedFile as discussed in
    rack-test/rack-test#30)
Commits on Sep 28, 2012
  1. backport 68677ff

    Evan Petrie committed Sep 28, 2012
  2. Hashrocket for 1.8 support

    jeremy committed Sep 28, 2012
  3. Shush syntax warnings

    jeremy committed Sep 28, 2012
Commits on Sep 27, 2012
  1. Tune up Rails::Rack::Logger. Only put space between requests in devel…

    jeremy committed Sep 26, 2012
    …opment logs.
    
    Conflicts:
    	railties/test/application/rack/logger_test.rb
  2. Add logger.push_tags and .pop_tags to complement logger.tagged

    jeremy committed Sep 26, 2012
    Avoid memory leak from unflushed logs on other threads leaving tags behind.
    
    Conflicts:
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/tagged_logging.rb
    	activesupport/test/tagged_logging_test.rb
  3. Log newlines separately to ensure the 'Started GET ...' line has a ta…

    jeremy committed Sep 26, 2012
    …g on the same line
Commits on Sep 25, 2012
  1. Merge pull request #7684 from jrochkind/connection_pool_timeout_key_b…

    rafaelfranca committed Sep 25, 2012
    …ackport
    
    ConnectionPool accepts spec key 'checkout_timeout' (Backport)
Commits on Sep 24, 2012
  1. ConnectionPool accepts spec key 'checkout_timeout'

    jrochkind committed Sep 21, 2012
    Backport of #6441 cb6f839 . Old 'wait_timeout' is still supported,
    but conflicts with mysql2 using that spec key for different thing.
    'checkout_timeout' can now be used taking precedence for ConnectionPool
    over 'wait_timeout'.
Commits on Sep 21, 2012
  1. Merge pull request #7723 from steveklabnik/backport_3554

    rafaelfranca committed Sep 21, 2012
    Backport #3544 to 3-2-stable
  2. Merge pull request #3544 from amatsuda/_field_changed

    tenderlove committed with steveklabnik Feb 14, 2012
    Rename field_changed? to _field_changed? so that users can create a field named field
    Conflicts:
    
    	activerecord/lib/active_record/core.rb
    	activerecord/test/cases/dirty_test.rb
Commits on Sep 20, 2012
  1. Revert "Revert "Respect `config.digest = false` for `asset_path`""

    rafaelfranca committed Sep 20, 2012
    This reverts commit 54f5574.
    
    Reason: the last commit fixed the failing case
  2. Revert "Respect `config.digest = false` for `asset_path`"

    rafaelfranca committed Sep 20, 2012
    This reverts commit 1ac19c1.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Reason: This is causing failures in the railties build.
    See http://travis-ci.org/#!/rails/rails/jobs/2491787
    
    Related with #7672
  3. Revert "backport fair connection pool 02b2335 to 3-2-stable"

    rafaelfranca committed Sep 20, 2012
    This reverts commit 0693e07.
    
    Revert "Cache columns metadata to avoid extra while testing"
    
    This reverts commit a82f1e3.
    
    Reason: This is causing failures in the postgresql build.
    See http://travis-ci.org/#!/rails/rails/builds/2485584
    
    Related with #7675
  4. Merge pull request #7718 from kennyj/fix_6962-32

    rafaelfranca committed Sep 20, 2012
    [3-2-stable] Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings.