Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection

# Conflicts: # Gemfile.lock
2018-03-08 12:12:06 +01:00
parent 782f9eea73 84bd85703d
commit 77a40c9fc5
7 changed files with 43 additions and 5 deletions
--- a/1
+++ b/1
@ -7,6 +7,7 @@ gem 'carrierwave'
 gem 'coffee-rails'
 gem 'concurrent-ruby'
 gem 'concurrent-ruby-ext', platform: :ruby
+gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
 gem 'docker-api', require: 'docker'
 gem 'factory_bot_rails'
 gem 'forgery'