summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-01 07:53:45 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-01 07:53:45 -0600
commitc231178a7ee69f13e19c5110e7176ce9f05743a7 (patch)
tree405e3159717c3457ff2a49cd8310091c1ebcfa64 /Gemfile
parentc578fb064c6a90cbaf60959d7706c0bcc34d87f5 (diff)
downloadgitlab-ce-c231178a7ee69f13e19c5110e7176ce9f05743a7.tar.gz
Upgrade oauth2 from 1.0.0 to 1.2.0.upgrade-oauth2
Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0 Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 5213a59cab0..4fac6e1e63d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -339,7 +339,7 @@ gem 'activerecord-session_store', '~> 1.0.0'
gem "nested_form", '~> 0.3.2'
# OAuth
-gem 'oauth2', '~> 1.0.0'
+gem 'oauth2', '~> 1.2.0'
# Soft deletion
gem "paranoia", "~> 2.0"