diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-26 14:56:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-26 14:56:52 +0000 |
| commit | 99144ea64e34b9c9cf91586cba8f3538a5f9e3af (patch) | |
| tree | cbd38aeb5d98086d9e196126a34a380d6b1f23dc | |
| parent | 42dd2634e347e42dc100596a6b2588e5f163322e (diff) | |
| download | gitlab-ce-99144ea64e34b9c9cf91586cba8f3538a5f9e3af.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@15-3-stable-ee
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -533,7 +533,7 @@ gem 'valid_email', '~> 0.1' # JSON gem 'json', '~> 2.5.1' gem 'json_schemer', '~> 0.2.18' -gem 'oj', '~> 3.13.20' +gem 'oj', '~> 3.13.21' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' diff --git a/Gemfile.lock b/Gemfile.lock index f04445e1d57..218a66d8f74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -887,7 +887,7 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - oj (3.13.20) + oj (3.13.21) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -1651,7 +1651,7 @@ DEPENDENCIES oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) - oj (~> 3.13.20) + oj (~> 3.13.21) omniauth (~> 1.8) omniauth-alicloud (~> 1.0.1) omniauth-atlassian-oauth2 (~> 0.2.0) |