Merge branch '45397-update-faraday_middleware-to-0.12.2' into 'master'

Update faraday_middleware to 0.12.2 Closes #45397 See merge request gitlab-org/gitlab-ce!18397

Merge branch '45397-update-faraday_middleware-to-0.12.2' into 'master'
671a204c · Sean McGivern · ddd7a81d · 4d3c75ab · 671a204c · 671a204c
Commit 671a204c authored Apr 16, 2018 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

45397-update-faraday_middleware-to-0-12-2.yml .../unreleased/45397-update-faraday_middleware-to-0-12-2.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -206,7 +206,7 @@ GEM
      railties (>= 3.0.0)
    faraday (0.12.2)
      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
      faraday (>= 0.7.4, < 1.0)
    faraday_middleware-multi_json (0.0.6)
      faraday_middleware

--- a/changelogs/unreleased/45397-update-faraday_middleware-to-0-12-2.yml
+++ b/changelogs/unreleased/45397-update-faraday_middleware-to-0-12-2.yml
+---
+title: Update faraday_middlewar to 0.12.2
+merge_request: 18397
+author: Takuya Noguchi
+type: security