diff options
author | Stan Hu <stanhu@gmail.com> | 2018-05-04 06:47:17 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-05-04 06:47:17 +0300 |
commit | 31fa96960f7d224a1da4ca1cf1520a657558567d (patch) | |
tree | 25eb6d3dc41c7022efe42d1df0ad47cc8fbb669c | |
parent | ef1bdc443be23b026042a6aeee6352b3652ebed5 (diff) | |
parent | e50bed7eff276eac2dc1fbb86bddb04d9dd9e70d (diff) |
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
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 6 | ||||
-rw-r--r-- | lib/api/entities.rb | 4 |
3 files changed, 6 insertions, 6 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? diff --git a/Gemfile.lock b/Gemfile.lock index 7fd49417c71..f7e2428a07f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -366,8 +366,8 @@ GEM rack (>= 1.3.0) rack-accept virtus (>= 1.0.0) - grape-entity (0.6.0) - activesupport + grape-entity (0.7.1) + activesupport (>= 4.0) multi_json (>= 1.3.2) grape-route-helpers (2.1.0) activesupport @@ -1073,7 +1073,7 @@ DEPENDENCIES google-protobuf (= 3.5.1) gpgme grape (~> 1.0) - grape-entity (~> 0.6.0) + grape-entity (~> 0.7.1) grape-route-helpers (~> 2.1.0) grape_logging (~> 1.7) grpc (~> 1.11.0) diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 75d56b82424..1619c1a09ee 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -149,11 +149,11 @@ module API expose_url(api_v4_projects_path(id: project.id)) end - expose :issues, if: -> (*args) { issues_available?(*args) } do |project| + expose :issues, if: -> (project, options) { issues_available?(project, options) } do |project| expose_url(api_v4_projects_issues_path(id: project.id)) end - expose :merge_requests, if: -> (*args) { mrs_available?(*args) } do |project| + expose :merge_requests, if: -> (project, options) { mrs_available?(project, options) } do |project| expose_url(api_v4_projects_merge_requests_path(id: project.id)) end |