diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-01 07:13:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-01 07:13:49 +0000 |
commit | fb58d337f0b8b6f685c1e94a9327d8d12ebfbf81 (patch) | |
tree | a285b8beb8303a81a7af0db968822fa05595e529 /Gemfile | |
parent | 3333112d46dd179a55295ebed754544a97b49b7f (diff) | |
download | gitlab-ce-fb58d337f0b8b6f685c1e94a9327d8d12ebfbf81.tar.gz |
Add latest changes from gitlab-org/gitlab@14-2-stable-ee
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.21.0' +gem 'gitlab-labkit', '~> 0.21.1' # 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' @@ -479,7 +479,7 @@ gem 'gitaly', '~> 14.2.0.pre.rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' -gem 'grpc', '~> 1.38.0' +gem 'grpc', '~> 1.30.2' gem 'google-protobuf', '~> 3.17.1' |