diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-04 22:20:01 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-04 22:20:01 +0300 |
| commit | f3a3bd50eafdcfcaeea21d6cfa0b8bbae7720fec (patch) | |
| tree | f11390dcf7b4bbfd103d33f5c79a4ed5524836c0 /Gemfile.lock | |
| parent | c7940733b410d5f55bbe150dd9b44453fdc9a731 (diff) | |
| parent | 8be9567c64d2c90a56e36308f39ee89938137614 (diff) | |
Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#cherry_pick to Gitaly
Closes gitaly#737
See merge request gitlab-org/gitlab-ce!15517
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 bee0ccb48da..fdb81b101f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -276,7 +276,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.54.0) + gitaly-proto (0.58.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1037,7 +1037,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.54.0) + gitaly-proto (~> 0.58.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |