diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /app/serializers/environment_entity.rb | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/serializers/environment_entity.rb')
| -rw-r--r-- | app/serializers/environment_entity.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/serializers/environment_entity.rb b/app/serializers/environment_entity.rb index 0bd9c602bf5..8c6ad010d69 100644 --- a/app/serializers/environment_entity.rb +++ b/app/serializers/environment_entity.rb @@ -3,6 +3,9 @@ class EnvironmentEntity < Grape::Entity include RequestAwareEntity + UNNECESSARY_ENTRIES_FOR_UPCOMING_DEPLOYMENT = + %i[manual_actions scheduled_actions playable_build cluster].freeze + expose :id expose :global_id do |environment| @@ -17,6 +20,11 @@ class EnvironmentEntity < Grape::Entity expose :last_deployment, using: DeploymentEntity expose :stop_action_available?, as: :has_stop_action + expose :upcoming_deployment, expose_nil: false do |environment, ops| + DeploymentEntity.represent(environment.upcoming_deployment, + ops.merge(except: UNNECESSARY_ENTRIES_FOR_UPCOMING_DEPLOYMENT)) + end + expose :metrics_path, if: -> (*) { environment.has_metrics? } do |environment| metrics_project_environment_path(environment.project, environment) end |