diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 15:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 15:08:59 +0000 |
| commit | 23288f62da73fb0e30d8e7ce306665e8fda1b932 (patch) | |
| tree | 2baf1339e4d7c7c35d6b8a52cfb90597a5d4cdf1 /Gemfile.lock | |
| parent | 7cc6872401eb487ed20dbb9d455f8bb9c97d9e39 (diff) | |
| download | gitlab-ce-23288f62da73fb0e30d8e7ce306665e8fda1b932.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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 b5aca8658b3..f7bc7441741 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -360,7 +360,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (1.81.0) + gitaly (1.85.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) @@ -1209,7 +1209,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 1.81.0) + gitaly (~> 1.85.0) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-labkit (= 0.9.1) |