diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-10 15:29:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-10 15:29:48 +0000 |
| commit | 97ece0ba06621a29f4935fadebc9d064d20de325 (patch) | |
| tree | 254c3a0981313327802f9993cd22dc229439f7e3 | |
| parent | c98a3c49fc88cd87cb30bd11f2f008971937260a (diff) | |
| parent | 9e601088853b8a1302e519239e70be29adbb628e (diff) | |
| download | gitlab-ce-97ece0ba06621a29f4935fadebc9d064d20de325.tar.gz | |
Merge branch 'gitaly-0.45.1' into 'master'
Use Gitaly 0.45.1 and gitaly-proto 0.41.0
See merge request gitlab-org/gitlab-ce!14787
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a8ab6c9666a..ff12df2fbb0 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0.44.0 +0.45.1 @@ -398,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.41.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 6040596dda5..f5712da7508 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.39.0) + gitaly-proto (0.41.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1027,7 +1027,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.39.0) + gitaly-proto (~> 0.41.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |