diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-04-12 14:48:33 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-04-12 15:01:43 +0100 |
| commit | dd2c9b9578d423c60c3a5eb19a7841e8a61faadf (patch) | |
| tree | a53429849836ed3a234aa17a76aa92f2d45b0bce | |
| parent | 1db54dffaffb83c7a1dacb4db7e4204c7bd1ddba (diff) | |
| download | rails-dd2c9b9578d423c60c3a5eb19a7841e8a61faadf.tar.gz rails-dd2c9b9578d423c60c3a5eb19a7841e8a61faadf.tar.bz2 rails-dd2c9b9578d423c60c3a5eb19a7841e8a61faadf.zip | |
add active_record_deprecated_finders as a dep
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | activerecord/activerecord.gemspec | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record.rb | 1 |
3 files changed, 9 insertions, 0 deletions
@@ -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' |