Permalink
Commits on Oct 10, 2012
  1. Eager autoload Preloader classes

    Without eager autoloading, these would be autoloaded
    only when #preloader_for is called, which is too late
    in threaded applications.
    committed Oct 10, 2012
Commits on Oct 7, 2012
  1. Backport 1a70499

    Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example:
    
      # Tag asset requests so it's easy to filter them from dev logs
      config.log_tags = [
        -> request { :assets if request.path.starts_with?(config.assets.prefix) },
        -> request { request.uuid }
      ]
    
      # Watch the logs, ignoring asset requests
      $ tail -100f log/development.log | grep -v assets
    jeremy committed Oct 7, 2012
  2. Merge pull request #7865 from teleological/link_to_remote_3_2

    Accept :remote as symbol in link_to options (backport)
    rafaelfranca committed Oct 7, 2012
Commits on Oct 6, 2012
  1. Accept :remote as symbol in link_to options

    Accept either :remote or 'remote' in both the html_options and
    (url_)options hash arguments to link_to.
    teleological committed with teleological Oct 6, 2012
  2. Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…

    …able
    
    can't pass :locals to #assert_template without a view test case (#3415)
    Conflicts:
    	actionpack/CHANGELOG.md
    rafaelfranca committed Oct 6, 2012
  3. Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…

    …capital_letters
    
    postgres, quote table names when fetching the primary key (#5920)
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
    rafaelfranca committed Oct 6, 2012
Commits on Oct 4, 2012
  1. Merge pull request #6978 from frodsan/count_nosql_unsaved_parent

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

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

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

    …ny-through
    
    Fix reset_counters crashing on has_many :through associations.
    Conflicts:
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/counter_cache.rb
    rafaelfranca committed Oct 2, 2012
  2. 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 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. 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 Oct 1, 2012
Commits on Sep 30, 2012
  1. 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. Merge pull request #7802 from steveklabnik/issue_7799

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

    Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
    rafaelfranca committed Sep 29, 2012
  2. 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
    rack-test/rack-test#30)
    Tim Vandecasteele committed with mjonuschat Jun 21, 2012
Commits on Sep 28, 2012
  1. 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. Hashrocket for 1.8 support

    jeremy committed Sep 28, 2012
  4. 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…

    …opment logs.
    
    Conflicts:
    	railties/test/application/rack/logger_test.rb
    jeremy committed Sep 26, 2012
  2. 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. Log newlines separately to ensure the 'Started GET ...' line has a ta…

    …g on the same line
    jeremy committed Sep 26, 2012
Commits on Sep 25, 2012
  1. 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. 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