diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-25 04:05:17 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-11-25 04:05:17 +0000 |
| commit | 5522b9dc0e488a4561e7791c8d85e39615da2901 (patch) | |
| tree | 1e235228d8d2f0b6c76b9c96472412233fead539 /Gemfile | |
| parent | d9eb2f2cf5525547fefb9a70663fe06e9f9e61ae (diff) | |
| parent | 0dc108507479b7dbd1d31ceab1989e13f766d613 (diff) | |
| download | gitlab-ce-5522b9dc0e488a4561e7791c8d85e39615da2901.tar.gz | |
Merge branch 'zj-upgrade-grape' into 'master'
Update grape-entity to 0.6.0
See merge request !7491
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API gem 'grape', '~> 0.15.0' -gem 'grape-entity', '~> 0.4.2' +gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination |