diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-25 19:03:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-25 19:03:51 +0000 |
| commit | af95ba2fb481be62722438e5d93b074b1d3f89cb (patch) | |
| tree | 1495fbd5588e20742d83441fbce871e44941e336 /Gemfile.lock | |
| parent | 491fb6a421320d0b013979507d85fc78264d7c01 (diff) | |
| parent | 6a28967c1461a840926940beb075e4f9285c7e82 (diff) | |
| download | gitlab-ce-af95ba2fb481be62722438e5d93b074b1d3f89cb.tar.gz | |
Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'
Migrate restoring repo from bundle to Gitaly
Closes gitaly#946
See merge request gitlab-org/gitlab-ce!16623
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 c8570cbb897..5532888d179 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.76.0) + gitaly-proto (0.78.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1056,7 +1056,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.76.0) + gitaly-proto (~> 0.78.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |