From dd2c9b9578d423c60c3a5eb19a7841e8a61faadf Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Thu, 12 Apr 2012 14:48:33 +0100 Subject: [PATCH] add active_record_deprecated_finders as a dep --- Gemfile | 6 ++++++ activerecord/activerecord.gemspec | 2 ++ activerecord/lib/active_record.rb | 1 + 3 files changed, 9 insertions(+) diff --git a/Gemfile b/Gemfile index acfb1c8e80..ada3f5e19f 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,12 @@ else gem 'journey', :git => "git://github.com/rails/journey" end +if ENV['AR_DEPRECATED_FINDERS'] + gem 'active_record_deprecated_finders', path: ENV['AR_DEPRECATED_FINDERS'] +else + gem 'active_record_deprecated_finders', git: 'git://github.com/rails/active_record_deprecated_finders' +end + # This needs to be with require false to avoid # it being automatically loaded by sprockets gem 'uglifier', '>= 1.0.3', :require => false diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec index 26eb74df0f..e8e5f4adfe 100644 --- a/activerecord/activerecord.gemspec +++ b/activerecord/activerecord.gemspec @@ -22,4 +22,6 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('activemodel', version) s.add_dependency('arel', '~> 3.0.2') + + s.add_dependency('active_record_deprecated_finders', '0.0.1') end diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 0cb0644bcf..c4b10a8dae 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -25,6 +25,7 @@ require 'active_support' require 'active_support/i18n' require 'active_model' require 'arel' +require 'active_record_deprecated_finders' require 'active_record/version'