diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-07 23:53:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-07 23:53:57 +0000 |
| commit | cfb5a76bb26521ff3ff68acc20466ea7feb49d9f (patch) | |
| tree | cb18b90a1d628d25bf1aa9846a00856471a5b8b2 | |
| parent | 068b1aeef94846fdcd96fe537ac5353cc0b6b198 (diff) | |
| parent | c231178a7ee69f13e19c5110e7176ce9f05743a7 (diff) | |
| download | gitlab-ce-cfb5a76bb26521ff3ff68acc20466ea7feb49d9f.tar.gz | |
Merge branch 'upgrade-oauth2' into 'master'
Upgrade oauth2 from 1.0.0 to 1.2.0.
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.
Adds support for Rails 5. Working toward #14286.
See merge request !5041
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -338,7 +338,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" diff --git a/Gemfile.lock b/Gemfile.lock index af8fbedc127..055596b056f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -353,7 +353,7 @@ GEM jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) - jwt (1.5.2) + jwt (1.5.4) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -393,7 +393,7 @@ GEM mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.11.2) + multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.20) @@ -406,12 +406,12 @@ GEM pkg-config (~> 1.1.7) numerizer (0.1.1) oauth (0.4.7) - oauth2 (1.0.0) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) octokit (4.3.0) sawyer (~> 0.7.0, >= 0.5.3) omniauth (1.3.1) @@ -895,7 +895,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.2.0) octokit (~> 4.3.0) omniauth (~> 1.3.1) omniauth-auth0 (~> 1.4.1) |