diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-12-25 10:43:04 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-12-25 10:43:04 +0000 |
| commit | 87bae6d42f7e562dc322b4913aa7160058d0608b (patch) | |
| tree | e8fe182c276a554ea3d946f48d1f16cdd8c5d99a /Gemfile.lock | |
| parent | 228f42b58b8f23b53494d32ff964aca47e90ac2e (diff) | |
| parent | 2694355bb6f6bf174b42127db35aa2c912501a9c (diff) | |
| download | gitlab-ce-87bae6d42f7e562dc322b4913aa7160058d0608b.tar.gz | |
Merge branch 'gitaly-remotes' into 'master'
Incorporate Gitaly's RemoteService RPCs
Closes gitaly#852
See merge request gitlab-org/gitlab-ce!16060
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b11b438a29c..0b714b6fe5d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.61.0) + gitaly-proto (0.62.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1046,7 +1046,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.61.0) + gitaly-proto (~> 0.62.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |