Add latest changes from gitlab-org/gitlab@master

6 files changed, 39 insertions, 82 deletions

diff --git a/vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml b/vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml
index 575fec39767..816b868915f 100644
--- a/vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml
+++ b/vendor/gems/omniauth-azure-oauth2/.gitlab-ci.yml
@@ -26,3 +26,11 @@ rspec-2.7:
 rspec-3.0:
   image: "ruby:3.0"
   extends: .rspec
+
+rspec-3.1:
+  image: "ruby:3.1"
+  extends: .rspec
+
+rspec-3.2:
+  image: "ruby:3.2"
+  extends: .rspec
diff --git a/vendor/gems/omniauth-gitlab/.gitlab-ci.yml b/vendor/gems/omniauth-gitlab/.gitlab-ci.yml
index da6547a1766..a802029c008 100644
--- a/vendor/gems/omniauth-gitlab/.gitlab-ci.yml
+++ b/vendor/gems/omniauth-gitlab/.gitlab-ci.yml
@@ -26,3 +26,11 @@ rspec-2.7:
 rspec-3.0:
   image: "ruby:3.0"
   extends: .rspec
+
+rspec-3.1:
+  image: "ruby:3.1"
+  extends: .rspec
+
+rspec-3.2:
+  image: "ruby:3.2"
+  extends: .rspec
diff --git a/vendor/gems/omniauth-google-oauth2/examples/Gemfile.lock b/vendor/gems/omniauth-google-oauth2/examples/Gemfile.lock
deleted file mode 100644
index 5ac8f1be5e0..00000000000
--- a/vendor/gems/omniauth-google-oauth2/examples/Gemfile.lock
+++ /dev/null
@@ -1,72 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    faraday (2.5.2)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
-    hashie (5.0.0)
-    json (2.6.2)
-    jwt (2.5.0)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    oauth2 (1.4.11)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 4)
-    omniauth (1.9.2)
-      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-google-oauth2 (0.8.2)
-      jwt (>= 2.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.1)
-      omniauth-oauth2 (>= 1.6)
-    omniauth-oauth2 (1.7.3)
-      oauth2 (>= 1.4, < 3)
-      omniauth (>= 1.9, < 3)
-    parallel (1.22.1)
-    parser (3.1.2.1)
-      ast (~> 2.4.1)
-    rack (1.6.13)
-    rack-protection (1.5.5)
-      rack
-    rainbow (3.1.1)
-    regexp_parser (2.6.0)
-    rexml (3.2.5)
-    rubocop (1.36.0)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    tilt (2.0.11)
-    unicode-display_width (2.3.0)
-    webrick (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  omniauth-google-oauth2 (~> 0.8.1)
-  rubocop
-  sinatra (~> 1.4)
-  webrick
-
-BUNDLED WITH
-   2.3.22
diff --git a/vendor/gems/omniauth-salesforce/.gitlab-ci.yml b/vendor/gems/omniauth-salesforce/.gitlab-ci.yml
index 4e18980d01c..15e7392e46b 100644
--- a/vendor/gems/omniauth-salesforce/.gitlab-ci.yml
+++ b/vendor/gems/omniauth-salesforce/.gitlab-ci.yml
@@ -26,3 +26,11 @@ rspec-2.7:
 rspec-3.0:
   image: "ruby:3.0"
   extends: .rspec
+
+rspec-3.1:
+  image: "ruby:3.1"
+  extends: .rspec
+
+rspec-3.2:
+  image: "ruby:3.2"
+  extends: .rspec
diff --git a/vendor/gems/omniauth-salesforce/Gemfile.lock b/vendor/gems/omniauth-salesforce/Gemfile.lock
index 0317b16dd9f..3f539c79853 100644
--- a/vendor/gems/omniauth-salesforce/Gemfile.lock
+++ b/vendor/gems/omniauth-salesforce/Gemfile.lock
@@ -82,14 +82,19 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     ruby2_keywords (0.0.5)
     shellany (0.0.1)
     simplecov (0.21.2)
@@ -116,7 +121,7 @@ DEPENDENCIES
   omniauth-salesforce!
   rack-test
   rb-fsevent
-  rspec (~> 2.7)
+  rspec (~> 3.1)
   simplecov
   webmock
 
diff --git a/vendor/gems/omniauth-salesforce/omniauth-salesforce.gemspec b/vendor/gems/omniauth-salesforce/omniauth-salesforce.gemspec
index 9c87746e9fd..c3564906281 100755
--- a/vendor/gems/omniauth-salesforce/omniauth-salesforce.gemspec
+++ b/vendor/gems/omniauth-salesforce/omniauth-salesforce.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'omniauth', '~> 2.0'
   gem.add_dependency 'omniauth-oauth2', '~> 1.0'
-  gem.add_development_dependency 'rspec', '~> 2.7'
+  gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'webmock'