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 | |
| 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
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-oauth2-gem.yml | 4 |
3 files changed, 11 insertions, 7 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' diff --git a/Gemfile.lock b/Gemfile.lock index 67f813b764f..a898c12485e 100644 --- a/Gemfile.lock +++ b/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) diff --git a/changelogs/unreleased/sh-bump-oauth2-gem.yml b/changelogs/unreleased/sh-bump-oauth2-gem.yml new file mode 100644 index 00000000000..b894a64968b --- /dev/null +++ b/changelogs/unreleased/sh-bump-oauth2-gem.yml @@ -0,0 +1,4 @@ +--- +title: Bump Faraday and dependent OAuth2 gem version to support no_proxy variable +merge_request: +author: |