diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-03 17:35:32 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-03 17:35:32 +0000 |
| commit | f7cb21930abaaa94118c1981149010abdd62de1a (patch) | |
| tree | 509210a0201581266ceee28370ec13ff9f66b830 /Gemfile.lock | |
| parent | 91cb64bf0fb3096f07174585f5a0e3db69181571 (diff) | |
| parent | 4b5b43383aa0bb391d131cdbfa55932579420f5b (diff) | |
| download | gitlab-ce-f7cb21930abaaa94118c1981149010abdd62de1a.tar.gz | |
Merge branch 'migrate-fork-repo-to-gitaly' into 'master'
Migrate repo forking to Gitaly
Closes gitaly#825
See merge request gitlab-org/gitlab-ce!16018
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 3cffed4901b..c510a6da2d7 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.62.0) + gitaly-proto (0.64.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.62.0) + gitaly-proto (~> 0.64.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |