summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-09-26 21:09:02 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-09-26 21:09:02 +0000
commit54816512157319868f85c235e90f42fec090b484 (patch)
tree409889530a733064a21c4fecd56529c72408b6fa /Gemfile
parent44311357c12eeb174f6977d4c385522cf82f6c55 (diff)
parentf693ef61d3de8b853195d1ed72180334998b5d83 (diff)
downloadgitlab-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')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 1b35e2110d5..35e83a530f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -89,7 +89,7 @@ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
gem 'github-linguist', '~> 5.3.3', require: 'linguist'
# API
-gem 'grape', '~> 1.0'
+gem 'grape', '~> 1.1'
gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'