summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-20 13:37:44 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-03-20 22:18:59 +0800
commitbb3fea8919ce62461f44ae9e679277c7144e9a5f (patch)
treefcfd9f0580c7deec43986a14ea9e870e3678243c
parent90fd74bfc745c4b10e4e2664a4363d686833d9b7 (diff)
downloadgitlab-ce-bb3fea8919ce62461f44ae9e679277c7144e9a5f.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 c60c045a4c2..fd44d4973ab 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)