From 8c74c0c2e2921d7128321b43c1b0abec7c6aa373 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 9 Jun 2017 14:26:03 -0700 Subject: Bump Faraday and dependent OAuth2 gem version to support no_proxy variable Closes gitlab-org/omnibus-gitlab#1714 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 715ce2bc6c2..48bf5d55c09 100644 --- a/Gemfile +++ b/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' -- cgit v1.2.1