diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-10-10 14:15:21 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-10-13 14:07:31 +0200 |
| commit | 0aff29f96b54e8036fe46315adb45295bc6c9efd (patch) | |
| tree | 23110ac96a9d0d8455aed256d5bdb05174af5919 /Gemfile.lock | |
| parent | c08fea6fd3b69c5efad14cf39783ef71a7006fad (diff) | |
| download | gitlab-ce-0aff29f96b54e8036fe46315adb45295bc6c9efd.tar.gz | |
Merge Merge Requests via Gitaly
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 b8b8054ad74..570af946c41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.41.0) + gitaly-proto (0.42.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1027,7 +1027,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.41.0) + gitaly-proto (~> 0.42.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |