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/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,6 +31,7 @@ GEM
      activemodel (= 4.2.10)
      activesupport (= 4.2.10)
      arel (~> 6.0)
+    activerecord-deprecated_finders (1.0.4)
    activerecord-jdbc-adapter (1.3.19)
      activerecord (>= 2.2)
    activerecord-jdbcpostgresql-adapter (1.3.19)
@@ -385,6 +386,7 @@ PLATFORMS
  ruby

 DEPENDENCIES
+  activerecord-deprecated_finders
  activerecord-jdbcpostgresql-adapter
  autotest-rails
  bcrypt