summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirate Praveen <praveen@debian.org>2018-03-15 08:38:01 +0100
committerPirate Praveen <praveen@debian.org>2018-03-21 17:35:23 +0100
commitcb9ee5c090cfe0f2cd53f495b37774aa2c0d9cc2 (patch)
tree3283dfb5c77ac5d6fa018c6d0e1e5a96649ac8e7
parent0005a78bbfd5f395f0c3e2eafec7e31e8466c93c (diff)
downloadgitlab-ce-cb9ee5c090cfe0f2cd53f495b37774aa2c0d9cc2.tar.gz
Update omniauth 1.4.2 -> 1.8
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 957ceff554f..9ce175c0c62 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,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)