summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-01 13:38:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-01 13:38:24 +0000
commit0396082c12f518f48e136968dbf0b4e5f774641c (patch)
tree9ee22b3f2d65483c316d30397b7e065d4dec5fec /Gemfile.lock
parentcb7e80d1211dae947e40290a834cbe29ee36364e (diff)
downloadgitlab-ce-0396082c12f518f48e136968dbf0b4e5f774641c.tar.gz
Add latest changes from gitlab-org/gitlab@15-2-stable-ee
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ccdd090ee9..718bcfcac9a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -869,7 +869,7 @@ GEM
plist (~> 3.1)
train-core
wmi-lite (~> 1.0)
- oj (3.13.16)
+ oj (3.13.19)
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.16)
+ oj (~> 3.13.19)
omniauth (~> 1.8)
omniauth-alicloud (~> 1.0.1)
omniauth-atlassian-oauth2 (~> 0.2.0)