summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-17 03:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-17 03:09:27 +0000
commit9345f69894862e02f3491ea3136c3ed2b23fd5b8 (patch)
tree08a4a1b2861cd5894e2a1146300a206071f06ea3 /Gemfile.lock
parentd43aaf286fe6b8e8383e73ea580274d8841608d7 (diff)
downloadgitlab-ce-9345f69894862e02f3491ea3136c3ed2b23fd5b8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6da9a9a1740..8006e45259a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -366,7 +366,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
git (1.5.0)
- gitaly (1.86.0)
+ gitaly (12.9.0.pre.rc4)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-chronic (0.10.5)
@@ -1228,7 +1228,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly (~> 1.86.0)
+ gitaly (~> 12.9.0.pre.rc4)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-derailed_benchmarks