summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-01-31 11:31:29 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-01-31 11:31:29 +0000
commit5d8bb33d48826abc7cd348a7c151c5b6985f0ade (patch)
tree24fdd6e911e931888c7786302016e603543c68f7 /Gemfile.lock
parent4251c6565fa18ecd64befe3a2561df30d48d1846 (diff)
parent94a3dbca33634dd4f6a1de8b14cd2a4f0a9a0abc (diff)
downloadgitlab-ce-5d8bb33d48826abc7cd348a7c151c5b6985f0ade.tar.gz
Merge branch 'zj-gitaly-server-info' into 'master'
Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4558b43af48..f770a7019e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -340,7 +340,7 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.4.1.1)
+ google-protobuf (3.5.1.1-universal-darwin)
googleapis-common-protos-types (1.0.1)
google-protobuf (~> 3.0)
googleauth (0.5.3)
@@ -369,7 +369,7 @@ GEM
rake
grape_logging (1.7.0)
grape
- grpc (1.8.3)
+ grpc (1.8.3-universal-darwin)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
googleauth (>= 0.5.1, < 0.7)