summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <tak.noguchi.iridge@gmail.com>2016-02-13 12:59:55 +0900
committerTakuya Noguchi <tak.noguchi.iridge@gmail.com>2016-02-13 12:59:55 +0900
commit4646cbc4c65854f8f3d0fc42ec385fb9f31db82b (patch)
tree6d9407ff84b856febdc00dad57b4f3b8ce274c2a
parent31c8dbc96fae558a794de18dbb5f06c2dc1a6286 (diff)
downloadgitlab-ce-4646cbc4c65854f8f3d0fc42ec385fb9f31db82b.tar.gz
Update omniauth to 1.3.1 for memory performance
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 9114fdd33ac..a1c57af4bac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem "pg", '~> 0.18.2', group: :postgres
gem 'devise', '~> 3.5.4'
gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.2.0'
-gem 'omniauth', '~> 1.2.2'
+gem 'omniauth', '~> 1.3.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-cas3', '~> 1.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 98a36724fe0..718285e1665 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -491,9 +491,9 @@ GEM
rack (~> 1.2)
octokit (3.8.0)
sawyer (~> 0.6.0, >= 0.5.3)
- omniauth (1.2.2)
+ omniauth (1.3.1)
hashie (>= 1.2, < 4)
- rack (~> 1.0)
+ rack (>= 1.0, < 3)
omniauth-azure-oauth2 (0.0.6)
jwt (~> 1.0)
omniauth (~> 1.0)
@@ -963,7 +963,7 @@ DEPENDENCIES
nprogress-rails (~> 0.1.6.7)
oauth2 (~> 1.0.0)
octokit (~> 3.8.0)
- omniauth (~> 1.2.2)
+ omniauth (~> 1.3.1)
omniauth-azure-oauth2 (~> 0.0.6)
omniauth-bitbucket (~> 0.0.2)
omniauth-cas3 (~> 1.1.2)