diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-21 17:15:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-21 17:15:20 +0000 |
| commit | aa168687a29e9f42a764878b98942857d9b353bb (patch) | |
| tree | ef327cc7aec0e2a44cab9a77f5c017008db32f6f | |
| parent | e39d9371e36034b4a5b41f5d49176611643cbe7a (diff) | |
| parent | cb9ee5c090cfe0f2cd53f495b37774aa2c0d9cc2 (diff) | |
| download | gitlab-ce-aa168687a29e9f42a764878b98942857d9b353bb.tar.gz | |
Merge branch 'update-omniauth' into 'master'
Update omniauth 1.4.2 -> 1.8
See merge request gitlab-org/gitlab-ce!17763
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -37,7 +37,7 @@ gem 'faraday', '~> 0.12' gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.3' gem 'doorkeeper-openid_connect', '~> 1.3' -gem 'omniauth', '~> 1.4.2' +gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' diff --git a/Gemfile.lock b/Gemfile.lock index f063edccc66..9eff80cd4d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -524,8 +524,8 @@ GEM rack (>= 1.2, < 3) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.4.3) - hashie (>= 1.2, < 4) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-auth0 (1.4.1) omniauth-oauth2 (~> 1.1) @@ -1104,7 +1104,7 @@ DEPENDENCIES nokogiri (~> 1.8.2) oauth2 (~> 1.4) octokit (~> 4.8) - omniauth (~> 1.4.2) + omniauth (~> 1.8) omniauth-auth0 (~> 1.4.1) omniauth-authentiq (~> 0.3.1) omniauth-azure-oauth2 (~> 0.0.9) |