Merge pull request #373 from Codeminer42/dependabot/bundler/grape-1.1.0

Codeminer42 · Sep 8, 2018 · 1037b7d · 1037b7d
2 parents 9dc87a0 + ce1ced1
commit 1037b7d
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -200,15 +200,12 @@ GEM
       activerecord (>= 4.0.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    grape (0.15.0)
+    grape (1.1.0)
       activesupport
       builder
-      hashie (>= 2.1.0)
-      multi_json (>= 1.3.2)
-      multi_xml (>= 0.5.2)
+      mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-      rack-mount
       virtus (>= 1.0.0)
     grape-entity (0.6.0)
       activesupport
@@ -222,7 +219,6 @@ GEM
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
     hashdiff (0.3.7)
-    hashie (3.4.4)
     heroics (0.0.23)
       erubis (~> 2.0)
       excon
@@ -278,9 +274,11 @@ GEM
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     moneta (0.8.1)
-    multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
+    mustermann (1.0.3)
+    mustermann-grape (1.0.0)
+      mustermann (~> 1.0.0)
     netrc (0.11.0)
     newrelic_rpm (3.17.0.325)
     nokogiri (1.8.4)
@@ -325,8 +323,6 @@ GEM
     rack-cache (1.6.1)
       rack (>= 0.4)
     rack-cors (1.0.2)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-protection (1.5.5)
       rack
     rack-test (0.6.3)