summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-06-09 14:26:03 -0700
committerStan Hu <stanhu@gmail.com>2017-06-09 14:27:11 -0700
commit8c74c0c2e2921d7128321b43c1b0abec7c6aa373 (patch)
treef8675f6e4c76fa549b9fb9f7ea0701c6eeb3ed0b /Gemfile
parent34f45cebcf31607def461cfaa3a50831cafb2a6a (diff)
downloadgitlab-ce-8c74c0c2e2921d7128321b43c1b0abec7c6aa373.tar.gz
Bump Faraday and dependent OAuth2 gem version to support no_proxy variable
Closes gitlab-org/omnibus-gitlab#1714
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
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'