diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-20 13:35:30 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-20 13:35:30 +0300 |
| commit | 2ca2d3d63fe219122a28685c8ec07c2ff3f13b91 (patch) | |
| tree | 5a874161117abed58e2d3cf16e6c45283b74937d /Gemfile.rails5.lock | |
| parent | a88a9e22c5f27b458593d08ee9dce5a834c51f2a (diff) | |
| parent | 9d7e73277ec65edfbcad269c1038ea0bb24e7427 (diff) | |
Merge branch 'use-backup-custom-hooks-gitaly' into 'master'
Use gitaly for backup rake task
See merge request gitlab-org/gitlab-ce!19742
Diffstat (limited to 'Gemfile.rails5.lock')
| -rw-r--r-- | Gemfile.rails5.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 223717f1818..fd560290d6c 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -286,7 +286,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (0.101.0) + gitaly-proto (0.102.0) google-protobuf (~> 3.1) grpc (~> 1.10) github-linguist (5.3.3) @@ -1049,7 +1049,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.101.0) + gitaly-proto (~> 0.102.0) github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-gollum-lib (~> 4.2) |