diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-06 14:37:39 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-06 14:37:39 +0300 |
| commit | 0713188bbae3b875de88858dbda5df7d525a6abe (patch) | |
| tree | d6e9390e6cb6354c88c517a8552cc4f01c8eb783 /lib | |
| parent | a2cd9ad2516e8119de4cb8c499dc07c8fc25c65c (diff) | |
| parent | 08bc2f946bc788b8a51e7a4136cc83e57d9f707a (diff) | |
Merge branch 'expose-job-duration' into 'master'
Expose `duration` in Job API entity
Closes #35794
See merge request gitlab-org/gitlab-ce!13644
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 67cecb6a7ad..398a7906dcb 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -822,6 +822,7 @@ module API class Job < Grape::Entity expose :id, :status, :stage, :name, :ref, :tag, :coverage expose :created_at, :started_at, :finished_at + expose :duration expose :user, with: User expose :artifacts_file, using: JobArtifactFile, if: -> (job, opts) { job.artifacts? } expose :commit, with: Commit |