diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-16 16:20:36 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-16 16:20:36 +0000 |
| commit | 671a204ccce6990ed1ad1d014482af6f7df0c52c (patch) | |
| tree | 25793a5c01188e8aa4566f2f285f627fbd489a6d | |
| parent | ddd7a81d4f20ca656731d4c01512893d2559a012 (diff) | |
| parent | 4d3c75ab74f8695cbb7c14f77515f3e8e6c3f228 (diff) | |
| download | gitlab-ce-671a204ccce6990ed1ad1d014482af6f7df0c52c.tar.gz | |
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
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/45397-update-faraday_middleware-to-0-12-2.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 23b6c2423e6..bbe3c9e49b8 100644 --- 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 diff --git a/changelogs/unreleased/45397-update-faraday_middleware-to-0-12-2.yml b/changelogs/unreleased/45397-update-faraday_middleware-to-0-12-2.yml new file mode 100644 index 00000000000..3370ec3feba --- /dev/null +++ b/changelogs/unreleased/45397-update-faraday_middleware-to-0-12-2.yml @@ -0,0 +1,5 @@ +--- +title: Update faraday_middlewar to 0.12.2 +merge_request: 18397 +author: Takuya Noguchi +type: security |