diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-04-11 22:29:30 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-04-24 16:17:52 -0300 |
| commit | 7030eb3286613be919e12daf95c43061b49aa5f5 (patch) | |
| tree | 22f86d1ad4dd5fd4c62482ae3d61adf0b51977a9 /Gemfile.lock | |
| parent | 1884f650ac4f34f1c0883112a4e3ce22caac869d (diff) | |
| download | gitlab-ce-7030eb3286613be919e12daf95c43061b49aa5f5.tar.gz | |
Add faraday gem
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bb91db1e805..7d9a950bfd3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,7 +47,7 @@ GEM akismet (2.0.0) allocations (1.0.5) arel (6.0.4) - asana (0.4.0) + asana (0.6.0) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) @@ -193,10 +193,12 @@ GEM factory_girl_rails (4.7.0) factory_girl (~> 4.7.0) railties (>= 3.0.0) - faraday (0.9.2) + faraday (0.11.0) multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) + faraday-http-cache (2.0.0) + faraday (~> 0.8) + faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json @@ -447,6 +449,7 @@ GEM mustermann-grape (0.4.0) mustermann (= 0.4.0) mysql2 (0.3.20) + net-http-persistent (2.9.4) net-ldap (0.12.1) net-ssh (3.0.1) netrc (0.11.0) @@ -454,8 +457,8 @@ GEM mini_portile2 (~> 2.1.0) numerizer (0.1.1) oauth (0.5.1) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) + oauth2 (1.3.1) + faraday (>= 0.8, < 0.12) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) @@ -853,7 +856,7 @@ DEPENDENCIES after_commit_queue (~> 1.3.0) akismet (~> 2.0) allocations (~> 1.0) - asana (~> 0.4.0) + asana (~> 0.6.0) asciidoctor (~> 1.5.2) asciidoctor-plantuml (= 0.0.7) attr_encrypted (~> 3.0.0) @@ -891,6 +894,8 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) factory_girl_rails (~> 4.7.0) + faraday (~> 0.11.0) + faraday-http-cache ffaker (~> 2.4) flay (~> 2.8.0) fog-aws (~> 0.9) @@ -941,9 +946,10 @@ DEPENDENCIES minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) + net-http-persistent (~> 2.9.4) net-ssh (~> 3.0.1) nokogiri (~> 1.6.7, >= 1.6.7.2) - oauth2 (~> 1.2.0) + oauth2 (~> 1.3.0) octokit (~> 4.6.2) oj (~> 2.17.4) omniauth (~> 1.4.2) |