diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-11-02 11:52:34 +0000 |
---|---|---|
committer | Kamil TrzciĆski <ayufan@ayufan.eu> | 2018-11-02 11:52:34 +0000 |
commit | cb0b16ebf6a56cd4cad8bdb8c7e915a3b75d6e10 (patch) | |
tree | 0c09cc93f4cd2035a8e29c9e536c93afc1176b59 /app | |
parent | 74c79123248f35db64db2a6612a2794810f555db (diff) | |
download | gitlab-ce-cb0b16ebf6a56cd4cad8bdb8c7e915a3b75d6e10.tar.gz |
Add scheduled flag to job entity
Diffstat (limited to 'app')
-rw-r--r-- | app/serializers/build_action_entity.rb | 7 | ||||
-rw-r--r-- | app/serializers/job_entity.rb | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/serializers/build_action_entity.rb b/app/serializers/build_action_entity.rb index 0db7875aa87..95833c3528f 100644 --- a/app/serializers/build_action_entity.rb +++ b/app/serializers/build_action_entity.rb @@ -12,7 +12,8 @@ class BuildActionEntity < Grape::Entity end expose :playable?, as: :playable - expose :scheduled_at, if: -> (build) { build.scheduled? } + expose :scheduled?, as: :scheduled + expose :scheduled_at, if: -> (*) { scheduled? } expose :unschedule_path, if: -> (build) { build.scheduled? } do |build| unschedule_project_job_path(build.project, build) @@ -25,4 +26,8 @@ class BuildActionEntity < Grape::Entity def playable? build.playable? && can?(request.current_user, :update_build, build) end + + def scheduled? + build.scheduled? + end end diff --git a/app/serializers/job_entity.rb b/app/serializers/job_entity.rb index a0a66511b7b..aebbc18e32f 100644 --- a/app/serializers/job_entity.rb +++ b/app/serializers/job_entity.rb @@ -33,6 +33,7 @@ class JobEntity < Grape::Entity end expose :playable?, as: :playable + expose :scheduled?, as: :scheduled expose :scheduled_at, if: -> (*) { scheduled? } expose :created_at expose :updated_at |