From 6aaba4c9c6e4f0b5788eb41cb83629fc1286a4ff Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Mon, 28 Mar 2016 17:19:13 -0600
Subject: [PATCH] Upgrade oauth2 from 1.0.0 to 1.1.0
1.1.0 loosens the requirements so Rack 2 can be used with the gem. Rack
2 will be a requirement for Rails 5.
No Changelog for this gem :/ I guess the commit will do:
https://github.com/intridea/oauth2/commit/43e1fdd87e95a5b02438d5cce6a67e
411afb5fec
---
Gemfile | 2 +-
Gemfile.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 006e53e0c10..049a35de754 100644
--- a/Gemfile
+++ b/Gemfile
@@ -324,7 +324,7 @@ gem 'activerecord-session_store', '~> 0.1.0'
gem "nested_form", '~> 0.3.2'
# OAuth
-gem 'oauth2', '~> 1.0.0'
+gem 'oauth2', '~> 1.0'
# Soft deletion
gem "paranoia", "~> 2.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index da27c62acbf..781660012ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -448,7 +448,7 @@ GEM
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
- jwt (1.5.2)
+ jwt (1.5.1)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -485,12 +485,12 @@ GEM
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
oauth (0.4.7)
- oauth2 (1.0.0)
+ oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
- jwt (~> 1.0)
+ jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3)
multi_xml (~> 0.5)
- rack (~> 1.2)
+ rack (>= 1.2, < 3)
octokit (3.8.0)
sawyer (~> 0.6.0, >= 0.5.3)
omniauth (1.3.1)
@@ -976,7 +976,7 @@ DEPENDENCIES
net-ssh (~> 3.0.1)
newrelic_rpm (~> 3.14)
nokogiri (~> 1.6.7, >= 1.6.7.2)
- oauth2 (~> 1.0.0)
+ oauth2 (~> 1.0)
octokit (~> 3.8.0)
omniauth (~> 1.3.1)
omniauth-auth0 (~> 1.4.1)
--
GitLab