diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-25 09:21:18 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-25 09:21:18 +0000 |
| commit | 6c372152837874f4fade2b9095cc06ba8e2f2fbd (patch) | |
| tree | bd251d5fd854c49c3bfcc6285a89942f8a53166b | |
| parent | dcf4d69a7e34fc0a093c1226833f8654f16c74f7 (diff) | |
| parent | 1971ae18f670775d48dd78e844b784d432ddaaca (diff) | |
| download | gitlab-ce-6c372152837874f4fade2b9095cc06ba8e2f2fbd.tar.gz | |
Merge branch 'gitaly-gem-rename' into 'master'
Use gitaly-proto 0.31.0
See merge request !13795
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -398,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly', '~> 0.30.0' +gem 'gitaly-proto', '~> 0.31.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 17bf48befac..0fd52337b23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly (0.30.0) + gitaly-proto (0.31.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1018,7 +1018,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly (~> 0.30.0) + gitaly-proto (~> 0.31.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) |