diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
| commit | 0e7f8fd5bd7ed184b8a12039739200065ffa2dbd (patch) | |
| tree | 07b3c3bbcc0d05848ab7034d2ed32a801f8786b9 /Gemfile | |
| parent | 203d1026008effeeba5c1f98dba768448473f9fe (diff) | |
| parent | 904cbe0132a1caf0dbb7efb8bdc70398d1d82289 (diff) | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -299,7 +299,6 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do - gem 'allocations', '~> 1.0', require: false, platform: :mri gem 'method_source', '~> 0.8', require: false gem 'influxdb', '~> 0.2', require: false @@ -419,7 +418,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.102.0', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed |