Skip to content
Commits on Oct 2, 2012
  1. @rafaelfranca

    Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…

    …riables
    
    prefix TemplateAssertions ivars.
    
    Closes #7459
    Conflicts:
    	actionpack/lib/action_controller/test_case.rb
    	actionpack/lib/action_view/test_case.rb
    rafaelfranca committed Oct 1, 2012
Commits on Oct 1, 2012
  1. @rafaelfranca

    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. @rafaelfranca

    Merge pull request #6450 from iHiD/resource_generator_routes_master

    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)
    rafaelfranca committed Sep 30, 2012
  3. @rafaelfranca
Commits on Sep 30, 2012
  1. @jeremy

    Asset manifest includes aliases for foo.js -> foo/index.js and vice v…

    …ersa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
    jeremy committed Sep 30, 2012
  2. @fxn

    Merge pull request #7802 from steveklabnik/issue_7799

    Fix reference to code sample in Getting Started.
    fxn committed Sep 30, 2012
  3. @steveklabnik
  4. @rafaelfranca
  5. @rafaelfranca

    Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased

    REBASED: fixing assert_template bug when template matches expected, but not ends with
    Conflicts:
    	actionpack/CHANGELOG.md
    	actionpack/lib/action_controller/test_case.rb
    rafaelfranca committed Sep 29, 2012
Commits on Sep 29, 2012
  1. @rafaelfranca

    Merge pull request #7786 from yabawock/3-2-stable

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

    Don't paramify ActionDispatch::Http::UploadedFile in tests

    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
    brynary/rack-test#30)
    Tim Vandecasteele committed with yabawock Jun 21, 2012
Commits on Sep 28, 2012
  1. @tenderlove

    Merge pull request #7785 from okcwest/3-2-stable

    backport 68677ff
    tenderlove committed Sep 28, 2012
  2. backport 68677ff

    Evan Petrie committed Sep 28, 2012
  3. @jeremy

    Hashrocket for 1.8 support

    jeremy committed Sep 28, 2012
  4. @jeremy
  5. @jeremy

    Shush syntax warnings

    jeremy committed Sep 28, 2012
Commits on Sep 27, 2012
  1. @jeremy

    Tune up Rails::Rack::Logger. Only put space between requests in devel…

    …opment logs.
    
    Conflicts:
    	railties/test/application/rack/logger_test.rb
    jeremy committed Sep 26, 2012
  2. @jeremy

    Add logger.push_tags and .pop_tags to complement logger.tagged

    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
    jeremy committed Sep 26, 2012
  3. @jeremy

    Log newlines separately to ensure the 'Started GET ...' line has a ta…

    …g on the same line
    jeremy committed Sep 25, 2012
  4. @jeremy
Commits on Sep 25, 2012
  1. @rafaelfranca

    Merge pull request #7684 from jrochkind/connection_pool_timeout_key_b…

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

    ConnectionPool accepts spec key 'checkout_timeout'

    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'.
    jrochkind committed Sep 21, 2012
Commits on Sep 21, 2012
  1. @rafaelfranca

    Fix invalid ruby 1.8 syntax

    rafaelfranca committed Sep 21, 2012
  2. @rafaelfranca

    Merge pull request #7723 from steveklabnik/backport_3554

    Backport #3544 to 3-2-stable
    rafaelfranca committed Sep 21, 2012
  3. @tenderlove @steveklabnik

    Merge pull request #3544 from amatsuda/_field_changed

    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
    tenderlove committed with steveklabnik Feb 14, 2012
Commits on Sep 20, 2012
  1. @rafaelfranca

    Revert "Revert "Respect `config.digest = false` for `asset_path`""

    This reverts commit 54f5574.
    
    Reason: the last commit fixed the failing case
    rafaelfranca committed Sep 20, 2012
  2. @rafaelfranca
  3. @rafaelfranca

    Revert "Respect `config.digest = false` for `asset_path`"

    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
    rafaelfranca committed Sep 20, 2012
  4. @rafaelfranca

    Revert "backport fair connection pool 02b2335 to 3-2-stable"

    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
    rafaelfranca committed Sep 20, 2012
  5. @rafaelfranca

    Merge pull request #7718 from kennyj/fix_6962-32

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

    Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and …

    …%::z format strings.
    kennyj committed Sep 20, 2012
  7. @jeremy @rafaelfranca

    Load the environment after creating the database

    Conflicts:
    	activerecord/lib/active_record/railties/databases.rake
    jeremy committed with rafaelfranca Sep 19, 2012
Commits on Sep 19, 2012
  1. @rafaelfranca

    Merge pull request #7668 from Draiken/fix_issue_6497

    Removing to_shorthand to fix #6497
    Conflicts:
    	actionpack/CHANGELOG.md
    rafaelfranca committed Sep 19, 2012
  2. @rafaelfranca
Commits on Sep 18, 2012
  1. @rafaelfranca

    Merge pull request #7686 from steveklabnik/add_upgrade_note

    Add upgrading note to 3.1 release notes.
    rafaelfranca committed Sep 18, 2012
Something went wrong with that request. Please try again.