diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6178c733c8f..74a89c79d5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,7 +29,7 @@ PATH specs: omniauth-azure-oauth2 (0.0.10) jwt (>= 1.0, < 3.0) - omniauth (~> 2.0) + omniauth (~> 1.0, < 3) omniauth-oauth2 (~> 1.4) PATH @@ -38,29 +38,28 @@ PATH omniauth-cas3 (1.1.4) addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) - omniauth (~> 2.0) + omniauth (~> 1.2, < 3) PATH remote: vendor/gems/omniauth-gitlab specs: omniauth-gitlab (4.0.0) - omniauth (~> 2.0) + omniauth (~> 1.0) omniauth-oauth2 (~> 1.7.1) PATH remote: vendor/gems/omniauth-google-oauth2 specs: - omniauth-google-oauth2 (1.0.1) + omniauth-google-oauth2 (0.6.0) jwt (>= 2.0) - oauth2 (~> 2.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth (>= 1.9, < 3) + omniauth-oauth2 (>= 1.5) PATH remote: vendor/gems/omniauth-salesforce specs: omniauth-salesforce (1.0.5) - omniauth (~> 2.0) + omniauth (~> 1.0, < 3) omniauth-oauth2 (~> 1.0) PATH @@ -69,7 +68,7 @@ PATH omniauth_crowd (2.4.0) activesupport nokogiri (>= 1.4.4) - omniauth (~> 2.0) + omniauth (~> 1.0, < 3) GEM remote: https://rubygems.org/ @@ -566,9 +565,9 @@ GEM gitlab-mail_room (0.0.9) gitlab-markup (1.8.0) gitlab-net-dns (0.9.1) - gitlab-omniauth-openid-connect (0.10.0) + gitlab-omniauth-openid-connect (0.9.1) addressable (~> 2.7) - omniauth (>= 1.9, < 3) + omniauth (~> 1.9) openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) @@ -914,10 +913,9 @@ GEM train-core wmi-lite (~> 1.0) oj (3.13.21) - omniauth (2.1.0) + omniauth (1.9.1) hashie (>= 3.4.6) - rack (>= 2.2.3) - rack-protection + rack (>= 1.6.2, < 3) omniauth-alicloud (1.0.1) omniauth-oauth2 (~> 1.7.1) omniauth-atlassian-oauth2 (0.2.0) @@ -934,9 +932,9 @@ GEM omniauth-oauth2 (~> 1.7) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (2.0.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-github (1.4.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) @@ -945,12 +943,9 @@ GEM omniauth (>= 1.9, < 3) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) - omniauth-rails_csrf_protection (1.0.1) - actionpack (>= 4.2) - omniauth (~> 2.0) - omniauth-saml (2.1.0) - omniauth (~> 2.0) - ruby-saml (~> 1.12) + omniauth-saml (1.10.0) + omniauth (~> 1.3, >= 1.3.2) + ruby-saml (~> 1.7) omniauth-shibboleth (1.3.0) omniauth (>= 1.0.0) omniauth-twitter (1.4.0) @@ -1059,8 +1054,6 @@ GEM httpclient json-jwt (>= 1.11.0) rack (>= 2.1.0) - rack-protection (2.2.2) - rack rack-proxy (0.7.2) rack rack-test (1.1.0) @@ -1453,7 +1446,7 @@ GEM validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) - validate_url (1.0.15) + validate_url (1.0.13) activemodel (>= 3.0.0) public_suffix validates_hostname (1.0.11) @@ -1606,7 +1599,7 @@ DEPENDENCIES gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) gitlab-net-dns (~> 0.9.1) - gitlab-omniauth-openid-connect (~> 0.10.0) + gitlab-omniauth-openid-connect (~> 0.9.0) gitlab-sidekiq-fetcher (= 0.8.0) gitlab-styles (~> 8.0.0) gitlab_chronic_duration (~> 0.10.6.2) @@ -1673,7 +1666,7 @@ DEPENDENCIES octokit (~> 4.15) ohai (~> 16.10) oj (~> 3.13.21) - omniauth (~> 2.1.0) + omniauth (~> 1.8) omniauth-alicloud (~> 1.0.1) omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) @@ -1683,13 +1676,12 @@ DEPENDENCIES omniauth-cas3 (~> 1.1.4)! omniauth-dingtalk-oauth2 (~> 1.0) omniauth-facebook (~> 4.0.0) - omniauth-github (= 2.0.0) + omniauth-github (~> 1.4) omniauth-gitlab (~> 4.0.0)! - omniauth-google-oauth2 (~> 1.0.1)! + omniauth-google-oauth2 (~> 0.6.0)! omniauth-oauth2-generic (~> 0.2.2) - omniauth-rails_csrf_protection omniauth-salesforce (~> 1.0.5)! - omniauth-saml (~> 2.1.0) + omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! |