Permalink
Switch branches/tags
Commits on Oct 2, 2013
  1. Merge pull request #12418 from makaroni4/fix/ar_reload_doc_12101

    senny committed Oct 2, 2013
    Update AR reload doc for the case of manually set primary key attribute [ci skip]
Commits on Oct 1, 2013
  1. Merge pull request #12416 from sepastian/guides_configuring_initializ…

    senny committed Oct 1, 2013
    …ation_hooks
    
    guides: configuring: fixing explanation of :after_initialize hook [ci skip]
  2. guides: configuring: fixing explanation of :after_initialize hook

    sepastian committed Oct 1, 2013
    :after_initialize runs after config/initializers, not before
  3. Merge pull request #12412 from bf4/allow_pathname_for_require_dependency

    fxn committed Oct 1, 2013
    Allow Pathname for require dependency
Commits on Sep 30, 2013
  1. Merge pull request #12407 from senny/extract_next_migration_number_in…

    senny committed Sep 30, 2013
    …to_module
    
    Extract `.next_migration_number` into module for third party generators.
  2. Add changlog entry for #10844

    pixeltrix committed Sep 30, 2013
  3. Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails

    pixeltrix committed Sep 30, 2013
    …into tamird-fix-ip-spoof-errors
  4. fix `test_sqlite3_mem` test run.

    senny committed Sep 30, 2013
    marshalling between processes does not work with an in-memory db.
    This breaks the `test_sqlite3_mem` run (see stacktrace below).
    After that failure most tests start to fail randomly.
    
    ```
    /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb:512:in `table_structure': Could not find table 'posts' (ActiveRecord::StatementInvalid)
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb:399:in `columns'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:93:in `block in prepare_default_proc'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:44:in `yield'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:44:in `columns'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/model_schema.rb:208:in `columns'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/model_schema.rb:249:in `column_defaults'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/locking/optimistic.rb:171:in `column_defaults'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:167:in `initialize'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:27:in `new'
    	from /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:27:in `new'
    	from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1368:in `block in test_marshal_between_processes'
    	from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1366:in `fork'
    	from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1366:in `test_marshal_between_processes'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:110:in `block (3 levels) in run'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:208:in `capture_exceptions'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:107:in `block (2 levels) in run'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:260:in `time_it'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:106:in `block in run'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:296:in `on_signal'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:280:in `with_info_handler'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:105:in `run'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:268:in `block (2 levels) in run'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:267:in `each'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:267:in `block in run'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:296:in `on_signal'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:285:in `with_info_handler'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:266:in `run'
    	from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `block in __run'
    	from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `map'
    	from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `__run'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:115:in `run'
    	from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:46:in `block in autorun'
    ```
    
    /cc @tenderlove
Commits on Sep 29, 2013
  1. Merge pull request #12383 from marclennox/master

    rafaelfranca committed Sep 29, 2013
    Fixed issue #12327
  2. Merge pull request #12400 from jaredbeck/fixes_guide_re_action_on_unp…

    rafaelfranca committed Sep 29, 2013
    …ermitted_parameters
    
    Fixes incorrect spelling of `action_on_unpermitted_parameters` in guide
  3. fixes incorrect spelling of `action_on_unpermitted_parameters`

    jaredbeck committed Sep 29, 2013
    See `actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb`
  4. Merge pull request #12354 from kennyj/fix_12293

    rafaelfranca committed Sep 29, 2013
    Closes #12293. Strong parameters should permit nested number as key.
  5. Merge pull request #12387 from francisgo/patch-9

    rafaelfranca committed Sep 29, 2013
    Migrations Guide: Add semicolon to sentences before code block [ci skip]
  6. Merge pull request #12398 from thedarkone/thread-safety-stuff

    rafaelfranca committed Sep 29, 2013
    Thread safety fixes
  7. Merge pull request #11496 from jetthoughts/11376_has_many_assoc_respe…

    rafaelfranca committed Sep 29, 2013
    …ct_scope_on_build
    
    Removed where_values_hash from AR::NullRelation
Commits on Sep 28, 2013
  1. Merge pull request #12396 from arthurnn/cleanup_logsubs

    rafaelfranca committed Sep 28, 2013
    Cleanup identitymap logger from LogSubscriber
  2. Make GTG::TransTable thread safe.

    thedarkone committed Sep 4, 2013
    From now on only the `[]=` method is allowed to modify the internal states hashes.
  3. Use TS::Cache instead of Mutex + Hash.

    thedarkone committed Aug 7, 2013
    TS::Cache#compute_if_absent guarantees that only a single thread will get to execute the provided block for a given key.
  4. Cleanup identitymap logger from LogSubscriber

    arthurnn committed Sep 28, 2013
    Also renaming ivar @odd_or_even to @odd
  5. Merge pull request #12391 from francisgo/patch-10

    senny committed Sep 28, 2013
    Migrations Guide: Fix line length [ci skip]
  6. Removed where_values_hash from AR::NullRelation

    pftg committed Jul 14, 2013
    In order to build associated records for owners which has not been saved
    need to get where values to use as default attributes.
    But for new record owner uses `ActiveRecord::NullRelation` which
    override `where_values_hash` to return empty hash stub.
    
    `where_values_hash` is not used to invoke any sql query, but good to
    build others chains (even will be never executed) like:
    
    ```ruby
      post          = Post.new
      admin_comment = post.admin_comments.build
    
      assert_equal 'Admin', admin_comment.author
    ```
    
    Closes #11376, #11676, #11675
Commits on Sep 27, 2013
  1. adding a test to demonstrate how to use STI subclasses on the far right

    tenderlove committed Sep 27, 2013
    side of a hm:t association along with preloading.
  2. Merge pull request #12388 from rkofman/master

    jeremy committed Sep 27, 2013
    Fixed grammatical typo in configuring.md guide.