diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-09 22:47:53 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-09 22:47:53 +0000 |
| commit | b134f950d70bdb73bc76e9a9091c0a50a6b8b8cd (patch) | |
| tree | ca027a1cad422fafd1000d1d8539456f139a5f39 /Gemfile | |
| parent | b16730fc8317b282d5dc86dbc8936c74303f5a36 (diff) | |
| parent | 8c74c0c2e2921d7128321b43c1b0abec7c6aa373 (diff) | |
| download | gitlab-ce-b134f950d70bdb73bc76e9a9091c0a50a6b8b8cd.tar.gz | |
Merge branch 'sh-bump-oauth2-gem' into 'master'
Bump Faraday and dependent OAuth2 gem version to support no_proxy variable
Closes omnibus-gitlab#1714
See merge request !12074
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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' |