Merge branch 'google-protobuf-3.4.1.1' into 'master'

Use google-protobuf 3.4.1.1 See merge request gitlab-org/gitlab-ce!14820

Merge branch 'google-protobuf-3.4.1.1' into 'master'
3dbfd298 · Rémy Coutable · c616200f · cc545a80 · 3dbfd298
Commit 3dbfd298 authored Oct 13, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -324,7 +324,7 @@ GEM
      mime-types (~> 3.0)
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
-    google-protobuf (3.4.0.2)
+    google-protobuf (3.4.1.1)
    googleauth (0.5.3)
      faraday (~> 0.12)
      jwt (~> 1.4)