diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-25 04:05:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-25 10:43:00 +0100 |
| commit | b382a21bf54ee91dd796963b112493f469155959 (patch) | |
| tree | 7dca7e18ed59f3de57787be4947b36ccea642354 | |
| parent | e78182a5faff7ed1cea59dea901ff8602b8ad638 (diff) | |
| download | gitlab-ce-b382a21bf54ee91dd796963b112493f469155959.tar.gz | |
Merge branch 'zj-upgrade-grape' into 'master'
Update grape-entity to 0.6.0
See merge request !7491
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-upgrade-grape.yml | 4 |
3 files changed, 7 insertions, 3 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 diff --git a/Gemfile.lock b/Gemfile.lock index 26c4dc0d23f..06c381d9c5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -322,7 +322,7 @@ GEM rack-accept rack-mount virtus (>= 1.0.0) - grape-entity (0.4.8) + grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) haml (4.0.7) @@ -873,7 +873,7 @@ DEPENDENCIES gollum-rugged_adapter (~> 0.4.2) gon (~> 6.1.0) grape (~> 0.15.0) - grape-entity (~> 0.4.2) + grape-entity (~> 0.6.0) haml_lint (~> 0.18.2) hamlit (~> 2.6.1) health_check (~> 2.2.0) diff --git a/changelogs/unreleased/zj-upgrade-grape.yml b/changelogs/unreleased/zj-upgrade-grape.yml new file mode 100644 index 00000000000..1df42d98733 --- /dev/null +++ b/changelogs/unreleased/zj-upgrade-grape.yml @@ -0,0 +1,4 @@ +--- +title: Update grape entity to 0.6.0 +merge_request: 7491 +author: |