diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-09-26 21:09:02 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-09-26 21:09:02 +0000 |
| commit | 54816512157319868f85c235e90f42fec090b484 (patch) | |
| tree | 409889530a733064a21c4fecd56529c72408b6fa /Gemfile.lock | |
| parent | 44311357c12eeb174f6977d4c385522cf82f6c55 (diff) | |
| parent | f693ef61d3de8b853195d1ed72180334998b5d83 (diff) | |
| download | gitlab-ce-54816512157319868f85c235e90f42fec090b484.tar.gz | |
Merge branch '51299-update-grape' into 'master'
Update grape to 1.1.0 to address a XSS vulnerability
Closes #51299
See merge request gitlab-org/gitlab-ce!21639
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4de78f3ec44..d8eaaac99b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -343,7 +343,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.3) + grape (1.1.0) activesupport builder mustermann-grape (~> 1.0.0) @@ -501,7 +501,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.2) + mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) @@ -1043,7 +1043,7 @@ DEPENDENCIES google-api-client (~> 0.23) google-protobuf (= 3.5.1) gpgme - grape (~> 1.0) + grape (~> 1.1) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.0) grape_logging (~> 1.7) |