Bump Faraday and dependent OAuth2 gem version to support no_proxy variable
Closes gitlab-org/omnibus-gitlab#1714
This commit is contained in:
parent
34f45cebcf
commit
8c74c0c2e2
4
Gemfile
4
Gemfile
|
@ -18,7 +18,7 @@ gem 'pg', '~> 0.18.2', group: :postgres
|
|||
|
||||
gem 'rugged', '~> 0.25.1.1'
|
||||
|
||||
gem 'faraday', '~> 0.11.0'
|
||||
gem 'faraday', '~> 0.12'
|
||||
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.2'
|
||||
|
@ -359,7 +359,7 @@ gem 'html2text'
|
|||
gem 'ruby-prof', '~> 0.16.2'
|
||||
|
||||
# OAuth
|
||||
gem 'oauth2', '~> 1.3.0'
|
||||
gem 'oauth2', '~> 1.4'
|
||||
|
||||
# Soft deletion
|
||||
gem 'paranoia', '~> 2.2'
|
||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -193,7 +193,7 @@ GEM
|
|||
factory_girl_rails (4.7.0)
|
||||
factory_girl (~> 4.7.0)
|
||||
railties (>= 3.0.0)
|
||||
faraday (0.11.0)
|
||||
faraday (0.12.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday_middleware (0.11.0.1)
|
||||
faraday (>= 0.7.4, < 1.0)
|
||||
|
@ -477,8 +477,8 @@ GEM
|
|||
mini_portile2 (~> 2.1.0)
|
||||
numerizer (0.1.1)
|
||||
oauth (0.5.1)
|
||||
oauth2 (1.3.1)
|
||||
faraday (>= 0.8, < 0.12)
|
||||
oauth2 (1.4.0)
|
||||
faraday (>= 0.8, < 0.13)
|
||||
jwt (~> 1.0)
|
||||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
|
@ -920,7 +920,7 @@ DEPENDENCIES
|
|||
email_reply_trimmer (~> 0.1)
|
||||
email_spec (~> 1.6.0)
|
||||
factory_girl_rails (~> 4.7.0)
|
||||
faraday (~> 0.11.0)
|
||||
faraday (~> 0.12)
|
||||
ffaker (~> 2.4)
|
||||
flay (~> 2.8.0)
|
||||
flipper (~> 0.10.2)
|
||||
|
@ -979,7 +979,7 @@ DEPENDENCIES
|
|||
mysql2 (~> 0.3.16)
|
||||
net-ssh (~> 3.0.1)
|
||||
nokogiri (~> 1.6.7, >= 1.6.7.2)
|
||||
oauth2 (~> 1.3.0)
|
||||
oauth2 (~> 1.4)
|
||||
octokit (~> 4.6.2)
|
||||
oj (~> 2.17.4)
|
||||
omniauth (~> 1.4.2)
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Bump Faraday and dependent OAuth2 gem version to support no_proxy variable
|
||||
merge_request:
|
||||
author:
|
Loading…
Reference in New Issue