diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-22 03:08:17 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-22 03:08:17 +0000 |
commit | 1127990db899d0fb36c900c81857ff6107e611d4 (patch) | |
tree | d704d0c91b9a91815cc7e9b9fb1f09c722b2eda4 /Gemfile.lock | |
parent | 4584816f15e57af3fbbf1d1280b691549384e1aa (diff) | |
download | gitlab-ce-1127990db899d0fb36c900c81857ff6107e611d4.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 cfccca87bf8..6eb3fc1b8dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -377,7 +377,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (13.1.0.pre.rc1) + gitaly (13.2.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) @@ -1237,7 +1237,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.1.0.pre.rc1) + gitaly (~> 13.2.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-labkit (= 0.12.0) |