Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirate Praveen <praveen@debian.org>2018-04-04 17:56:14 +0300
committerRémy Coutable <remy@rymai.me>2018-05-03 19:16:26 +0300
commit829441dcbccf79e5bb8c9c3d7486a81e6a3dbfe4 (patch)
treeb4d1f24aa1d56ee1effd2bcfb59b7c530c7f13ab
parent7ff891e5ec21bc392abeab7d5049df49596d53a6 (diff)
Update grape-entity 0.6.0 -> 0.7.1
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 7a18fab2058..932b4ccc94e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,7 +90,7 @@ gem 'github-linguist', '~> 5.3.3', require: 'linguist'
# API
gem 'grape', '~> 1.0'
-gem 'grape-entity', '~> 0.6.0'
+gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
# Disable strong_params so that Mash does not respond to :permitted?
diff --git a/Gemfile.lock b/Gemfile.lock
index 87ee15e9e76..b1912671665 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -366,8 +366,8 @@ GEM
rack (>= 1.3.0)
rack-accept
virtus (>= 1.0.0)
- grape-entity (0.6.0)
- activesupport
+ grape-entity (0.7.1)
+ activesupport (>= 4.0)
multi_json (>= 1.3.2)
grape-route-helpers (2.1.0)
activesupport
@@ -1073,7 +1073,7 @@ DEPENDENCIES
google-protobuf (= 3.5.1)
gpgme
grape (~> 1.0)
- grape-entity (~> 0.6.0)
+ grape-entity (~> 0.7.1)
grape-route-helpers (~> 2.1.0)
grape_logging (~> 1.7)
grpc (~> 1.11.0)