Manually edited the Gemfile.lock to make the gitlab-ce pipeline happy.

3cf07b6e · Matthias Fechner · 101ef91d · 3cf07b6e · 3cf07b6e
Commit 3cf07b6e authored Nov 30, 2018 by Matthias Fechner
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +1 -1

Gemfile.rails4.lock Gemfile.rails4.lock +1 -1

No files found.
--- 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)

--- 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)