summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-11 02:44:41 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-23 17:11:49 +0900
commit38b1ec2cc04e850ff4898615cf9596de0f6235e1 (patch)
tree881a8644f9f89362a450876f69937cc48e0dabf5 /app
parentea08e2c8afa468afecede56836b5ceb5dcd1f63e (diff)
downloadgitlab-ce-38b1ec2cc04e850ff4898615cf9596de0f6235e1.tar.gz
Fix rspec failure
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/builds_controller.rb3
-rw-r--r--app/controllers/projects/merge_requests_controller.rb3
-rw-r--r--app/controllers/projects/pipelines_controller.rb3
3 files changed, 3 insertions, 6 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index caa3d335765..3441d3919e2 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -76,8 +76,7 @@ class Projects::BuildsController < Projects::ApplicationController
def status
render json: BuildSerializer
.new(project: @project, user: @current_user)
- .only_status
- .represent(@build)
+ .represent_status(@build)
end
def erase
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index c873d06de5a..a20334757e0 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -476,8 +476,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def status
render json: PipelineSerializer
.new(project: @project, user: @current_user)
- .only_status
- .represent(@merge_request.head_pipeline)
+ .represent_status(@merge_request.head_pipeline)
end
def ci_environments_status
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 12ab43665f2..43a1abaa662 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -75,8 +75,7 @@ class Projects::PipelinesController < Projects::ApplicationController
def status
render json: PipelineSerializer
.new(project: @project, user: @current_user)
- .only_status
- .represent(@pipeline)
+ .represent_status(@pipeline)
end
def stage