diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 19:43:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 19:43:42 +0000 |
| commit | 8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3 (patch) | |
| tree | 6749b899adc622297e0443084ef6fd1909fffd00 /Gemfile | |
| parent | de235133e1f8b318b0ee6f49269e576b6e969486 (diff) | |
| download | gitlab-ce-8f3fbbf0d56091ad87158f61bf2a4e96a7f937e3.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-ee
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -309,12 +309,12 @@ gem 'rack-attack', '~> 6.3.0' gem 'sentry-raven', '~> 3.0' # PostgreSQL query parsing -gem 'pg_query', '~> 2.0.3' +gem 'pg_query', '~> 1.3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.17.1' +gem 'gitlab-labkit', '~> 0.16.2' # 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' @@ -485,7 +485,7 @@ gem 'gitaly', '~> 13.12.0.pre.rc1' gem 'grpc', '~> 1.30.2' -gem 'google-protobuf', '~> 3.15.8' +gem 'google-protobuf', '~> 3.14.0' gem 'toml-rb', '~> 1.0.0' |