Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reaper has access to threadsafe active? call #13981

Merged

Conversation

kacasey8
Copy link
Contributor

@kacasey8 kacasey8 commented Feb 9, 2014

This should be the simplest way resolve #12867, reverts breakage caused by 34c7e73

tenderlove added a commit that referenced this pull request Feb 9, 2014
…adsafe

Reaper has access to threadsafe active? call
@tenderlove tenderlove merged commit e4dc303 into rails:master Feb 9, 2014
tenderlove added a commit that referenced this pull request Feb 9, 2014
…adsafe

Reaper has access to threadsafe active? call
@vipulnsward
Copy link
Member

👍

rafaelfranca added a commit that referenced this pull request Feb 15, 2014
Add a missing changelog entry for #13981 and #14035
rafaelfranca added a commit that referenced this pull request Feb 16, 2014
Add a missing changelog entry for #13981 and #14035
tenderlove added a commit that referenced this pull request Feb 17, 2014
* master: (311 commits)
  Add a missing changelog entry for #13981 and #14035
  Revert "Fixed plugin_generator test"
  implements new option :month_format_string for date select helpers [Closes #13618]
  add factory methods for empty alias trackers
  guarantee a list in the alias tracker so we can remove a conditional
  stop exposing table_joins
  make most parameters to the AliasTracker required
  make a singleton for AssociationScope
  pass the association and connection to the scope method
  pass the tracker down the stack and construct it in the scope method
  clean up add_constraints signature
  remove the reflection delegate
  remove klass delegator
  remove railties changes. fixes #14054
  remove chain delegate
  remove scope_chain delegate
  Add verb to sanitization note
  fix path shown in mailer's templates
  updated Travis build status image url
  fix guide active_support_core_extensions. add Note to String#indent [ci skip]
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency.rb
	activerecord/test/cases/associations/association_scope_test.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rails 4.0.0 and 4.0.1 PostgreSQLAdapter does not properly check whether a connection is active
4 participants