diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-27 08:56:26 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-27 08:56:26 +0000 |
| commit | d3f033d69cec33e8058ee9f029718882990175b0 (patch) | |
| tree | a831ad104b072f3b5e689a1bb13da202109d5bf3 /Gemfile.lock | |
| parent | 124a0cab33f6b9abda40351d2d5b4c382d514460 (diff) | |
| parent | 67f2faa72d53096bf71cbe126b5b6d0830d42886 (diff) | |
| download | gitlab-ce-d3f033d69cec33e8058ee9f029718882990175b0.tar.gz | |
Merge branch 'bvl-use-shell-writeref' into 'master'
Don't use rugged write-ref anymore
See merge request gitlab-org/gitlab-ce!23286
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 20231696795..fdcac3b3952 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.123.0) + gitaly-proto (1.1.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -1006,7 +1006,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.123.0) + gitaly-proto (~> 1.1.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) |