summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-20 13:37:44 +0000
committerRémy Coutable <remy@rymai.me>2017-03-20 13:37:44 +0000
commit915af2dc5ae903d0007f5c2c75518483e00ab610 (patch)
tree66457df9b14d78f79a6e32aaa8869fa4463ea27f
parent62194ab46ad93246d982e3b88c2d1e625260d190 (diff)
parent6006aaf5e889b0d7d81923cbc9056b89cdc7c4d6 (diff)
downloadgitlab-ce-915af2dc5ae903d0007f5c2c75518483e00ab610.tar.gz
Merge branch 'protobuf-3.2.0.2' into 'master'
Use google-protobuf 3.2.0.2 See merge request !10014
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 734911baf3f..043ca4f8800 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)
+ google-protobuf (3.2.0.2)
googleauth (0.5.1)
faraday (~> 0.9)
jwt (~> 1.4)