summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-15 16:19:07 +0000
committerRémy Coutable <remy@rymai.me>2017-03-15 16:19:07 +0000
commit952e148d88d84e54cdeb37b268ee74b7eb3433e0 (patch)
tree5b0e58bfbe4b92dbb3b2503bdc9799cce8bf3f55
parentb7123a8f59fc6c5124c7e39f998cec9a6db5c690 (diff)
downloadgitlab-ce-952e148d88d84e54cdeb37b268ee74b7eb3433e0.tar.gz
Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'"
This reverts merge request !9932
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e38f45b8e98..c60c045a4c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -304,7 +304,7 @@ GEM
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
- google-protobuf (3.2.0.1)
+ google-protobuf (3.2.0)
googleauth (0.5.1)
faraday (~> 0.9)
jwt (~> 1.4)