Merge pull request #148 from GSA/mct/bump_ffi_160743152

update ffi & grape gems

Gemfile

@@ -69,7 +69,7 @@ gem 'sitelink_generator', git: 'https://github.com/GSA/sitelink_generator', ref:
 gem 'typhoeus', '~> 1.3.0'
 gem 'activerecord-validate_unique_child_attribute', '~> 0.1.0', require: 'active_record/validate_unique_child_attribute'
 gem 'jwt', '~> 1.5.6'
-gem 'grape', '~> 1.0.1'
+gem 'grape', '~> 1.1'
 gem 'grape-entity', '~> 0.6.0'
 gem 'rack-cors', '~> 1.0.2', :require => 'rack/cors'
 gem 'hashie', '~> 3.3.0'

Gemfile.lock

@@ -302,7 +302,7 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     federal_register (0.6.3)
       httparty (>= 0.7.0)
-    ffi (1.9.18)
+    ffi (1.9.25)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -331,7 +331,7 @@ GEM
       os (~> 0.9)
       signet (~> 0.7)
     googlecharts (1.6.12)
-    grape (1.0.2)
+    grape (1.1.0)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -432,7 +432,7 @@ GEM
     multi_test (0.1.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (1.0.1)
+    mustermann (1.0.3)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
     mysql2 (0.3.21)
@@ -783,7 +783,7 @@ DEPENDENCIES
   google-api-client (~> 0.19.1)
   google_visualr (~> 2.5.1)
   googlecharts (~> 1.6.12)
-  grape (~> 1.0.1)
+  grape (~> 1.1)
   grape-entity (~> 0.6.0)
   haml (~> 5.0.4)
   hashie (~> 3.3.0)