diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-16 12:46:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-16 12:46:12 +0000 |
| commit | 03e26defa6289cdccb05fd31c38190f35a760649 (patch) | |
| tree | 4cd11faab2285790de3f81f249fe53b791a09ee3 /Gemfile | |
| parent | 9c9d23151174fbbcf0b40bd1a223b9b7b60d1342 (diff) | |
| parent | 5886030f08bd41cba22509987fd5b232ec7ec965 (diff) | |
| download | gitlab-ce-03e26defa6289cdccb05fd31c38190f35a760649.tar.gz | |
Merge branch 'gem-update-grape' into 'master'
Update grape to 0.18.0
## What does this MR do?
Update grape to 0.18.0. Required for the settings API.
## What are the relevant issue numbers?
#22928
See merge request !8057
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -67,7 +67,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API -gem 'grape', '~> 0.15.0' +gem 'grape', '~> 0.18.0' gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' |