summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-13 18:56:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-13 18:56:27 +0000
commit09b628c32e2c0bf54347745cf7d165cf987731c0 (patch)
tree90087576f91c250ebb71fa9bf377878e0a7feb81 /Gemfile.lock
parentd979a5b16b918928ba290135da1e2df07aeda887 (diff)
downloadgitlab-ce-09b628c32e2c0bf54347745cf7d165cf987731c0.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-10-stable-ee
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock9
1 files changed, 6 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b4190c88bc4..e6cf7c5d935 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1042,7 +1042,7 @@ GEM
retriable (3.1.2)
reverse_markdown (1.4.0)
nokogiri
- rexml (3.2.4)
+ rexml (3.2.5)
rinku (2.0.0)
rotp (2.1.2)
rouge (3.26.0)
@@ -1116,8 +1116,9 @@ GEM
ruby-magic-static (0.3.4)
ruby-prof (1.3.1)
ruby-progressbar (1.11.0)
- ruby-saml (1.7.2)
- nokogiri (>= 1.5.10)
+ ruby-saml (1.12.1)
+ nokogiri (>= 1.10.5)
+ rexml
ruby-statistics (2.1.2)
ruby2_keywords (0.0.2)
ruby_parser (3.15.0)
@@ -1552,6 +1553,7 @@ DEPENDENCIES
request_store (~> 1.5)
responders (~> 3.0)
retriable (~> 3.1.2)
+ rexml (~> 3.2.5)
rouge (~> 3.26.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
@@ -1563,6 +1565,7 @@ DEPENDENCIES
ruby-magic-static (~> 0.3.4)
ruby-prof (~> 1.3.0)
ruby-progressbar (~> 1.10)
+ ruby-saml (~> 1.12.1)
ruby_parser (~> 3.15)
rubyzip (~> 2.0.0)
rugged (~> 1.1)