diff --git a/Gemfile b/Gemfile index 74e5407..90e0cde 100644 --- a/Gemfile +++ b/Gemfile @@ -53,7 +53,7 @@ gem 'sidekiq', '~> 4.2.0' gem 'sidetiq' # The API for incoming requests -gem 'grape', '~> 0.19.0' +gem 'grape', '~> 1.1.0' # gem 'grape-rails-cache', git: private_github_uri('grape-rails-cache') gem 'grape-entity' diff --git a/Gemfile.lock b/Gemfile.lock index 2e50924..70cdf33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,12 +190,9 @@ GEM formatador (0.2.5) globalid (0.4.1) activesupport (>= 4.2.0) - grape (0.19.2) + 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 @@ -228,7 +225,6 @@ GEM guard (~> 2.0) rubocop (~> 0.20) hashdiff (0.3.7) - hashie (3.5.7) hitimes (1.2.6) http (3.0.0) addressable (~> 2.3) @@ -239,7 +235,7 @@ GEM domain_name (~> 0.5) http-form_data (2.0.0) http_parser.rb (0.6.0) - i18n (0.9.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) inch (0.7.1) @@ -294,8 +290,7 @@ GEM modware (0.1.3) key_struct (~> 0.4) multi_json (1.13.1) - multi_xml (0.6.0) - mustermann (1.0.1) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) nenv (0.3.0) @@ -325,7 +320,7 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.0.1) - rack (2.0.4) + rack (2.0.5) rack-accept (0.4.5) rack (>= 0.4) rack-protection (2.0.0) @@ -533,7 +528,7 @@ DEPENDENCIES faker font-awesome-rails gelf (~> 3.0)! - grape (~> 0.19.0) + grape (~> 1.1.0) grape-entity guard guard-bundler