diff options
author | Rubén Dávila <ruben@gitlab.com> | 2018-08-07 06:13:48 -0500 |
---|---|---|
committer | Rubén Dávila <ruben@gitlab.com> | 2018-08-07 06:13:48 -0500 |
commit | 5c748a0bd9665c2036340d3f2b475df013810e62 (patch) | |
tree | 241867bdf9ad5684f1992df013dbe386784f55d3 /Gemfile.lock | |
parent | d737abc537476bf2b500f550b0c733d22f338cf1 (diff) | |
download | gitlab-ce-5c748a0bd9665c2036340d3f2b475df013810e62.tar.gz |
Backport some changes from gitlab-org/gitlab-ee!6767
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 d8f878875f3..1537cacaadd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.109.0) + gitaly-proto (0.112.0) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -1048,7 +1048,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.109.0) + gitaly-proto (~> 0.112.0) github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) |