summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-26 14:57:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-26 14:57:03 +0000
commit84791b4700ae69ff57d28d6a8720e77d173e22c1 (patch)
tree33241580a199563510630451fc21aa6e9ce5aa80
parent29372e8623bde76fbaf4cf38441aa8b437ab687d (diff)
downloadgitlab-ce-84791b4700ae69ff57d28d6a8720e77d173e22c1.tar.gz
Add latest changes from gitlab-org/security/gitlab@15-2-stable-ee
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c9ae2e59456..5e8908a5a77 100644
--- a/Gemfile
+++ b/Gemfile
@@ -536,7 +536,7 @@ gem 'valid_email', '~> 0.1'
# JSON
gem 'json', '~> 2.5.1'
gem 'json_schemer', '~> 0.2.18'
-gem 'oj', '~> 3.13.19'
+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 d9dd012a822..637a733bcc2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -869,7 +869,7 @@ GEM
plist (~> 3.1)
train-core
wmi-lite (~> 1.0)
- oj (3.13.19)
+ oj (3.13.21)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
@@ -1637,7 +1637,7 @@ DEPENDENCIES
oauth2 (~> 2.0)
octokit (~> 4.15)
ohai (~> 16.10)
- oj (~> 3.13.19)
+ oj (~> 3.13.21)
omniauth (~> 1.8)
omniauth-alicloud (~> 1.0.1)
omniauth-atlassian-oauth2 (~> 0.2.0)