summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fechner <idefix@fechner.net>2018-11-30 07:21:01 +0100
committerMatthias Fechner <idefix@fechner.net>2018-11-30 07:21:01 +0100
commit3cf07b6e02559a723bf9818d9bb32c596ff8c105 (patch)
treea237006e10eb93c655d78547d13ee2cce94b168e
parent101ef91dab22c1790c8f1e6215fc3cd0e69d939b (diff)
downloadgitlab-ce-3cf07b6e02559a723bf9818d9bb32c596ff8c105.tar.gz
Manually edited the Gemfile.lock to make the gitlab-ce pipeline happy.
-rw-r--r--Gemfile.lock2
-rw-r--r--Gemfile.rails4.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d7ef3b114d3..27730fa2cc3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1017,7 +1017,7 @@ DEPENDENCIES
google-api-client (~> 0.23)
google-protobuf (~> 3.6)
gpgme
- grape (~> 1.1)
+ grape (~> 1.1.0)
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.0)
grape_logging (~> 1.7)
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index ea248dfdabe..2cd0ef3d97a 100644
--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -1008,7 +1008,7 @@ DEPENDENCIES
google-api-client (~> 0.23)
google-protobuf (~> 3.6)
gpgme
- grape (~> 1.1)
+ grape (~> 1.1.0)
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.0)
grape_logging (~> 1.7)