diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-06 22:00:00 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-06 22:05:22 +0200 |
| commit | 37a7b099d6eafc87209368a9fc7f608282b99e08 (patch) | |
| tree | a2712e439cec8547d84bed2d57d339cb1cd5c502 /app/serializers | |
| parent | 57c353fca7121a120142161b253004f33d815766 (diff) | |
| parent | 73cb71e41c0ade92b9673a5d74c7dd78679fae91 (diff) | |
| download | gitlab-ce-37a7b099d6eafc87209368a9fc7f608282b99e08.tar.gz | |
Merge remote-tracking branch 'origin/master' into optimise-pipelinesoptimise-pipelines
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/build_action_entity.rb | 2 | ||||
| -rw-r--r-- | app/serializers/build_entity.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/serializers/build_action_entity.rb b/app/serializers/build_action_entity.rb index 184f5fd4b52..184b4b7a681 100644 --- a/app/serializers/build_action_entity.rb +++ b/app/serializers/build_action_entity.rb @@ -11,4 +11,6 @@ class BuildActionEntity < Grape::Entity build.project, build) end + + expose :playable?, as: :playable end diff --git a/app/serializers/build_entity.rb b/app/serializers/build_entity.rb index fadd6c5c597..b804d6d0e8a 100644 --- a/app/serializers/build_entity.rb +++ b/app/serializers/build_entity.rb @@ -16,6 +16,7 @@ class BuildEntity < Grape::Entity path_to(:play_namespace_project_build, build) end + expose :playable?, as: :playable expose :created_at expose :updated_at expose :detailed_status, as: :status, with: StatusEntity |