diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-27 15:21:22 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-27 15:21:22 +0300 |
| commit | 8391fa37f00e99851ff601c16bd7484499dc4f99 (patch) | |
| tree | de18e940dc974c5278cdbdd5eccee7bd4cf2ee78 /app/controllers/projects/builds_controller.rb | |
| parent | 856d29918b089cf56b0cf590c46eb559627d39ce (diff) | |
| parent | b3375a49647853f45df11b464bf7aa3e34af0f88 (diff) | |
Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serializer-gitlab-ci-status-for-pipeline-job-and-merge-request' into 'master'
Expose CI/CD status API endpoints with Gitlab::Ci::Status facility on pipeline, job and merge request for favicon
See merge request !9561
Diffstat (limited to 'app/controllers/projects/builds_controller.rb')
| -rw-r--r-- | app/controllers/projects/builds_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index f1e4246e7fb..3f3c90a49ab 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -74,7 +74,9 @@ class Projects::BuildsController < Projects::ApplicationController end def status - render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha) + render json: BuildSerializer + .new(project: @project, user: @current_user) + .represent_status(@build) end def erase |