diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-01 09:27:34 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-10-02 18:08:14 +0300 |
| commit | 7fc74818a32a713d971582f8730b163dade8df3d (patch) | |
| tree | 13055903f3a45633b2d74aecb28070c7a55747de /app/serializers | |
| parent | 384da9279eefd7ebcdfd684ff234540d935ededd (diff) | |
Add scheduled_actions as an explicit group of actions
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/build_action_entity.rb | 1 | ||||
| -rw-r--r-- | app/serializers/job_entity.rb | 1 | ||||
| -rw-r--r-- | app/serializers/pipeline_details_entity.rb | 1 | ||||
| -rw-r--r-- | app/serializers/pipeline_serializer.rb | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/build_action_entity.rb b/app/serializers/build_action_entity.rb index f9da3f63911..3e81f8f0218 100644 --- a/app/serializers/build_action_entity.rb +++ b/app/serializers/build_action_entity.rb @@ -12,6 +12,7 @@ class BuildActionEntity < Grape::Entity end expose :playable?, as: :playable + expose :scheduled_at private diff --git a/app/serializers/job_entity.rb b/app/serializers/job_entity.rb index 26b29993fec..dd6c2fa1a6d 100644 --- a/app/serializers/job_entity.rb +++ b/app/serializers/job_entity.rb @@ -25,6 +25,7 @@ class JobEntity < Grape::Entity end expose :playable?, as: :playable + expose :scheduled_at expose :created_at expose :updated_at expose :detailed_status, as: :status, with: DetailedStatusEntity diff --git a/app/serializers/pipeline_details_entity.rb b/app/serializers/pipeline_details_entity.rb index 3b56767f774..d78ad4af4dc 100644 --- a/app/serializers/pipeline_details_entity.rb +++ b/app/serializers/pipeline_details_entity.rb @@ -5,5 +5,6 @@ class PipelineDetailsEntity < PipelineEntity expose :ordered_stages, as: :stages, using: StageEntity expose :artifacts, using: BuildArtifactEntity expose :manual_actions, using: BuildActionEntity + expose :scheduled_actions, using: BuildActionEntity end end diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index 4f31af3c46d..7451433a841 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -13,6 +13,7 @@ class PipelineSerializer < BaseSerializer :cancelable_statuses, :trigger_requests, :manual_actions, + :scheduled_actions, :artifacts, { pending_builds: :project, |