From eb43d7ece822c530b61a966219cd57feef47cd96 Mon Sep 17 00:00:00 2001
From: Jessie Young <jessieyoung@gitlab.com>
Date: Fri, 26 Aug 2022 17:28:12 -0700
Subject: [PATCH] Use vendored version of omniaith-azure-oauth 2 gem
* Was vendored in a separate MR, now we are using the vendored version
* MR where vendored gem was added: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95236
---
Gemfile | 2 +-
Gemfile.lock | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index ff38308d4c976..40f1674ba4df1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ gem 'ruby-saml', '~> 1.13.0'
gem 'omniauth', '~> 1.8'
gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
-gem 'omniauth-azure-oauth2', '~> 0.0.9' # See vendor/gems/omniauth-azure-oauth2/README.md
+gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
gem 'omniauth-dingtalk-oauth2', '~> 1.0'
gem 'omniauth-alicloud', '~> 1.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index be6c9289dc7b0..5bfda48ca3aa2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,6 +24,14 @@ PATH
connection_pool (~> 2.0)
mail (~> 2.7)
+PATH
+ remote: vendor/gems/omniauth-azure-oauth2
+ specs:
+ omniauth-azure-oauth2 (0.0.10)
+ jwt (>= 1.0, < 3.0)
+ omniauth (~> 1.0, < 3)
+ omniauth-oauth2 (~> 1.4)
+
PATH
remote: vendor/gems/omniauth-cas3
specs:
@@ -910,10 +918,6 @@ GEM
omniauth-oauth2 (>= 1.5)
omniauth-azure-activedirectory-v2 (1.0.0)
omniauth-oauth2 (~> 1.7)
- omniauth-azure-oauth2 (0.0.10)
- jwt (>= 1.0, < 3.0)
- omniauth (~> 1.0)
- omniauth-oauth2 (~> 1.4)
omniauth-dingtalk-oauth2 (1.0.1)
omniauth-oauth2 (~> 1.7)
omniauth-facebook (4.0.0)
@@ -1663,7 +1667,7 @@ DEPENDENCIES
omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3)
omniauth-azure-activedirectory-v2 (~> 1.0)
- omniauth-azure-oauth2 (~> 0.0.9)
+ omniauth-azure-oauth2 (~> 0.0.9)!
omniauth-cas3 (~> 1.1.4)!
omniauth-dingtalk-oauth2 (~> 1.0)
omniauth-facebook (~> 4.0.0)
--
GitLab