Merge pull request #432 from bendb-instacart/require_activesupport

Require ActiveSupport.on_load in flipper-active_record
flippercloud · Sep 12, 2019 · 51d7c84 · 51d7c84
2 parents 171457d + a4a9bcc
commit 51d7c84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ rvm:
   - 2.4
   - 2.5
 before_install:
-  - gem install bundler -v 1.17.3 --no-rdoc --no-ri --without guard
+  - gem install bundler -v 1.17.3 --without guard
   - bundle _1.17.3_ install
 script: bundle exec rubocop -D && bundle exec rake
 services:

diff --git a/lib/flipper-active_record.rb b/lib/flipper-active_record.rb
@@ -1,3 +1,5 @@
+require 'activesupport/lazy_load_hooks'
+
 ActiveSupport.on_load(:active_record) do
   require 'flipper/adapters/active_record'
 end