3 files changed, 8 insertions, 2 deletions
diff --git a/lib/api/entities/ci/job_basic.rb b/lib/api/entities/ci/job_basic.rb
index 0badde4089e..3d9318ec428 100644
--- a/lib/api/entities/ci/job_basic.rb
+++ b/lib/api/entities/ci/job_basic.rb
@@ -18,6 +18,12 @@ module API
         expose :web_url do |job, _options|
           Gitlab::Routing.url_helpers.project_job_url(job.project, job)
         end
+
+        expose :project do
+          expose :ci_job_token_scope_enabled do |job|
+            job.project.ci_job_token_scope_enabled?
+          end
+        end
       end
     end
   end
diff --git a/lib/api/entities/ci/job_request/image.rb b/lib/api/entities/ci/job_request/image.rb
index 83f64da6050..92d68269265 100644
--- a/lib/api/entities/ci/job_request/image.rb
+++ b/lib/api/entities/ci/job_request/image.rb
@@ -8,7 +8,7 @@ module API
           expose :name, :entrypoint
           expose :ports, using: Entities::Ci::JobRequest::Port
 
-          expose :pull_policy, if: ->(_) { ::Feature.enabled?(:ci_docker_image_pull_policy) }
+          expose :pull_policy
         end
       end
     end
diff --git a/lib/api/entities/ci/job_request/service.rb b/lib/api/entities/ci/job_request/service.rb
index 7d494c7e516..128591058fe 100644
--- a/lib/api/entities/ci/job_request/service.rb
+++ b/lib/api/entities/ci/job_request/service.rb
@@ -8,7 +8,7 @@ module API
           expose :name, :entrypoint
           expose :ports, using: Entities::Ci::JobRequest::Port
 
-          expose :pull_policy, if: ->(_) { ::Feature.enabled?(:ci_docker_image_pull_policy) }
+          expose :pull_policy
           expose :alias, :command
           expose :variables
         end