Merge d2b6840 into 6575906

Gemfile.lock

@@ -84,9 +84,9 @@ GEM
     colorize (0.8.1)
     concurrent-ruby (1.0.5)
     concurrent-ruby (1.0.5-java)
-    config (1.6.1)
+    config (1.7.0)
       activesupport (>= 3.0)
-      deep_merge (~> 1.1.1)
+      deep_merge (~> 1.2.1)
       dry-validation (>= 0.10.4)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
@@ -95,7 +95,7 @@ GEM
       thor (~> 0.19.4)
       tins (~> 1.6)
     debug_inspector (0.0.3)
-    deep_merge (1.1.1)
+    deep_merge (1.2.1)
     default_value_for (3.0.4)
       activerecord (>= 3.2.0, < 5.2)
     devise (3.5.10)
@@ -113,7 +113,7 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.2)
+    dry-core (0.4.3)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
     dry-logic (0.4.2)
@@ -168,7 +168,7 @@ GEM
     hashie (3.5.6)
     highline (1.7.10)
     hike (1.2.3)
-    i18n (0.9.3)
+    i18n (0.9.4)
       concurrent-ruby (~> 1.0)
     inflecto (0.0.2)
     inherited_resources (1.4.1)
@@ -191,6 +191,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
+    minitest (4.7.5)
     multi_json (1.13.1)
     multipart-post (2.0.0)
     mysql2 (0.4.10)