diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/serializers/issue_board_entity.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/serializers/issue_board_entity.rb')
-rw-r--r-- | app/serializers/issue_board_entity.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/issue_board_entity.rb b/app/serializers/issue_board_entity.rb index ea629d9d774..17a36f5fb07 100644 --- a/app/serializers/issue_board_entity.rb +++ b/app/serializers/issue_board_entity.rb @@ -20,7 +20,7 @@ class IssueBoardEntity < Grape::Entity API::Entities::Project.represent issue.project, only: [:id, :path] end - expose :milestone, expose_nil: false do |issue| + expose :milestone, if: -> (issue) { issue.milestone } do |issue| API::Entities::Milestone.represent issue.milestone, only: [:id, :title] end @@ -53,4 +53,4 @@ class IssueBoardEntity < Grape::Entity end end -IssueBoardEntity.prepend_if_ee('EE::IssueBoardEntity') +IssueBoardEntity.prepend_mod_with('IssueBoardEntity') |