diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-04 03:47:17 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-04 03:47:17 +0000 |
| commit | 31fa96960f7d224a1da4ca1cf1520a657558567d (patch) | |
| tree | 25eb6d3dc41c7022efe42d1df0ad47cc8fbb669c /Gemfile | |
| parent | ef1bdc443be23b026042a6aeee6352b3652ebed5 (diff) | |
| parent | e50bed7eff276eac2dc1fbb86bddb04d9dd9e70d (diff) | |
| download | gitlab-ce-31fa96960f7d224a1da4ca1cf1520a657558567d.tar.gz | |
Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master'
Update grape-entity 0.6.0 -> 0.7.1
See merge request gitlab-org/gitlab-ce!18720
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -90,7 +90,7 @@ gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API gem 'grape', '~> 1.0' -gem 'grape-entity', '~> 0.6.0' +gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # Disable strong_params so that Mash does not respond to :permitted? |