Merge branch 'master' of gitlab.com:gitlab-org/security/gitlab
Showing
... | ... | @@ -314,6 +314,9 @@ gem 'premailer-rails', '~> 1.10.3' |
# LabKit: Tracing and Correlation | ||
gem 'gitlab-labkit', '~> 0.16.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 | ||
... | ... |
... | ... | @@ -141,7 +141,7 @@ |
"sql.js": "^0.4.0", | ||
"string-hash": "1.1.3", | ||
"style-loader": "^1.3.0", | ||
"swagger-ui-dist": "^3.32.4", | ||
"swagger-ui-dist": "^3.43.0", | ||
"three": "^0.84.0", | ||
"three-orbit-controls": "^82.1.0", | ||
"three-stl-loader": "^1.0.4", | ||
... | ... |
Please register or sign in to comment