diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-21 11:30:04 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-21 11:30:04 +0000 |
commit | c2437be50c2b8a50bd62f9b376fb45aa44db1825 (patch) | |
tree | eac9f9827e46225035eab19ee63bd4641da1698b /Gemfile | |
parent | 1733090a9efd3ee6c3c7e0eb0001602db89a04d7 (diff) | |
parent | 6b8ad689da393125bb2d1e548211c9a50039b0a7 (diff) | |
download | gitlab-ce-c2437be50c2b8a50bd62f9b376fb45aa44db1825.tar.gz |
Merge branch 'dz-update-grape' into 'master'
Update grape gem
See merge request !12992
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -71,7 +71,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.4', require: false gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API -gem 'grape', '~> 0.19.0' +gem 'grape', '~> 0.19.2' gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' |