diff options
| author | Mek Stittri <mstittri@gitlab.com> | 2018-06-20 18:05:56 +0300 |
|---|---|---|
| committer | Mek Stittri <mstittri@gitlab.com> | 2018-06-20 18:05:56 +0300 |
| commit | 3e28cca5744410a82131bf02e17d785c7223d44b (patch) | |
| tree | 2a5713659df1ed0c6865714032af9ac2c8f73b2a /Gemfile | |
| parent | acdc0d73274b80fb104eea73e86eb4b9f92c848d (diff) | |
| parent | abc6be62a06349f395da0b33e814512ef15c06fb (diff) | |
Resolve conflicts with latest workflow label changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -419,7 +419,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 |