Commit c76d53d3 authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch 'sh-upgrade-ms-azure-oauth2-provider' into 'master'

Upgrade omniauth-azure-activedirectory-v2 to v1.0.0

See merge request gitlab-org/gitlab!64559
parents 7705f554 eee74a26
...@@ -35,7 +35,7 @@ gem 'rexml', '~> 3.2.5' ...@@ -35,7 +35,7 @@ gem 'rexml', '~> 3.2.5'
gem 'ruby-saml', '~> 1.12.1' gem 'ruby-saml', '~> 1.12.1'
gem 'omniauth', '~> 1.8' gem 'omniauth', '~> 1.8'
gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-activedirectory-v2', '~> 0.1' gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-facebook', '~> 4.0.0'
......
...@@ -617,7 +617,7 @@ GEM ...@@ -617,7 +617,7 @@ GEM
hana (1.3.6) hana (1.3.6)
hangouts-chat (0.0.5) hangouts-chat (0.0.5)
hashdiff (1.0.1) hashdiff (1.0.1)
hashie (3.6.0) hashie (4.1.0)
hashie-forbidden_attributes (0.1.1) hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0) hashie (>= 3.0)
health_check (3.0.0) health_check (3.0.0)
...@@ -809,7 +809,7 @@ GEM ...@@ -809,7 +809,7 @@ GEM
shellany (~> 0.0) shellany (~> 0.0)
numerizer (0.2.0) numerizer (0.2.0)
oauth (0.5.4) oauth (0.5.4)
oauth2 (1.4.4) oauth2 (1.4.7)
faraday (>= 0.8, < 2.0) faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0) jwt (>= 1.0, < 3.0)
multi_json (~> 1.3) multi_json (~> 1.3)
...@@ -832,8 +832,8 @@ GEM ...@@ -832,8 +832,8 @@ GEM
train-core train-core
wmi-lite (~> 1.0) wmi-lite (~> 1.0)
oj (3.10.6) oj (3.10.6)
omniauth (1.9.0) omniauth (1.9.1)
hashie (>= 3.4.6, < 3.7.0) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)
omniauth-atlassian-oauth2 (0.2.0) omniauth-atlassian-oauth2 (0.2.0)
omniauth (>= 1.1.1) omniauth (>= 1.1.1)
...@@ -843,8 +843,8 @@ GEM ...@@ -843,8 +843,8 @@ GEM
omniauth-authentiq (0.3.3) omniauth-authentiq (0.3.3)
jwt (>= 1.5) jwt (>= 1.5)
omniauth-oauth2 (>= 1.5) omniauth-oauth2 (>= 1.5)
omniauth-azure-activedirectory-v2 (0.1.1) omniauth-azure-activedirectory-v2 (1.0.0)
omniauth-oauth2 omniauth-oauth2 (~> 1.7)
omniauth-azure-oauth2 (0.0.10) omniauth-azure-oauth2 (0.0.10)
jwt (>= 1.0, < 3.0) jwt (>= 1.0, < 3.0)
omniauth (~> 1.0) omniauth (~> 1.0)
...@@ -873,9 +873,9 @@ GEM ...@@ -873,9 +873,9 @@ GEM
omniauth-oauth (1.1.0) omniauth-oauth (1.1.0)
oauth oauth
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (1.6.0) omniauth-oauth2 (1.7.1)
oauth2 (~> 1.1) oauth2 (~> 1.4)
omniauth (~> 1.9) omniauth (>= 1.9, < 3)
omniauth-oauth2-generic (0.2.2) omniauth-oauth2-generic (0.2.2)
omniauth-oauth2 (~> 1.0) omniauth-oauth2 (~> 1.0)
omniauth-salesforce (1.0.5) omniauth-salesforce (1.0.5)
...@@ -1566,7 +1566,7 @@ DEPENDENCIES ...@@ -1566,7 +1566,7 @@ DEPENDENCIES
omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-atlassian-oauth2 (~> 0.2.0)
omniauth-auth0 (~> 2.0.0) omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.3) omniauth-authentiq (~> 0.3.3)
omniauth-azure-activedirectory-v2 (~> 0.1) omniauth-azure-activedirectory-v2 (~> 1.0)
omniauth-azure-oauth2 (~> 0.0.9) omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4) omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0) omniauth-facebook (~> 4.0.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment