From ec3226bd60f545c8ffb231011c45afa0bfc66e86 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Thu, 19 Jan 2017 17:49:16 +0000
Subject: Merge branch 'upgrade-omniauth' into 'security'

Upgrade OmniAuth Ruby gem to 1.3.2

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26813

See merge request !2056
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index 83ba5d31b92..4e9cf91c429 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem 'rugged', '~> 0.24.0'
 # Authentication libraries
 gem 'devise',                 '~> 4.2'
 gem 'doorkeeper',             '~> 4.2.0'
-gem 'omniauth',               '~> 1.3.1'
+gem 'omniauth',               '~> 1.3.2'
 gem 'omniauth-auth0',         '~> 1.4.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
 gem 'omniauth-cas3',          '~> 1.1.2'
-- 
cgit v1.2.3