summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-03 22:27:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-03 22:27:34 +0000
commitaf4486c9f7697f5186bcef08000ca954793bc31b (patch)
tree8a97f10b4312c42fe226ab2001d5f4b14215245b /Gemfile
parent03979b4aaf060cae40934b2aade0bbe8a210e311 (diff)
downloadgitlab-ce-af4486c9f7697f5186bcef08000ca954793bc31b.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-9-stable-ee
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 58eea956427..0445cc391aa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -310,6 +310,9 @@ gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.14.0'
+# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
+# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
+gem 'thrift', '>= 0.14.0'
# I18n
gem 'ruby_parser', '~> 3.15', require: false