diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-11-21 14:47:52 +0100 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-12-04 19:21:07 +0100 |
| commit | 8be9567c64d2c90a56e36308f39ee89938137614 (patch) | |
| tree | a55ba823bc018892369904216af97cfc47877c8b /Gemfile.lock | |
| parent | 02111f4d4d03246530e8453d669c63cdbe80fb44 (diff) | |
| download | gitlab-ce-8be9567c64d2c90a56e36308f39ee89938137614.tar.gz | |
Migrate Gitlab::Git::Repository#cherry_pick to Gitaly
Closes gitaly#737
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 3f4c930c71d..86030981936 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) @@ -1036,7 +1036,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) |