From 2b33e9eeb68199f7085102a85c06821b991ecd4d Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Fri, 10 Mar 2017 18:30:39 +0900 Subject: with_status to only_status --- app/controllers/projects/builds_controller.rb | 2 +- app/controllers/projects/merge_requests_controller.rb | 2 +- app/controllers/projects/pipelines_controller.rb | 2 +- app/serializers/build_serializer.rb | 2 +- app/serializers/pipeline_serializer.rb | 2 +- spec/serializers/build_serializer_spec.rb | 2 +- spec/serializers/pipeline_serializer_spec.rb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index f141cd6c3be..caa3d335765 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -76,7 +76,7 @@ class Projects::BuildsController < Projects::ApplicationController def status render json: BuildSerializer .new(project: @project, user: @current_user) - .with_status + .only_status .represent(@build) end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 5087abedf40..c873d06de5a 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -476,7 +476,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController def status render json: PipelineSerializer .new(project: @project, user: @current_user) - .with_status + .only_status .represent(@merge_request.head_pipeline) end diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 976827040ac..12ab43665f2 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -75,7 +75,7 @@ class Projects::PipelinesController < Projects::ApplicationController def status render json: PipelineSerializer .new(project: @project, user: @current_user) - .with_status + .only_status .represent(@pipeline) end diff --git a/app/serializers/build_serializer.rb b/app/serializers/build_serializer.rb index b1739caaf5f..e0096dc7b4a 100644 --- a/app/serializers/build_serializer.rb +++ b/app/serializers/build_serializer.rb @@ -1,7 +1,7 @@ class BuildSerializer < BaseSerializer entity BuildEntity - def with_status + def only_status tap { @status_only = { only: [{ details: [:status] }] } } end diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index 6b6e4a8f0f0..c667fc840b2 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -11,7 +11,7 @@ class PipelineSerializer < BaseSerializer @paginator.present? end - def with_status + def only_status tap { @status_only = { only: [{ details: [:status] }] } } end diff --git a/spec/serializers/build_serializer_spec.rb b/spec/serializers/build_serializer_spec.rb index ef75a2941c2..e6437538328 100644 --- a/spec/serializers/build_serializer_spec.rb +++ b/spec/serializers/build_serializer_spec.rb @@ -13,7 +13,7 @@ describe BuildSerializer do context 'when used with status' do let(:serializer) do described_class.new(user: user) - .with_status + .only_status end let(:resource) { create(:ci_build) } diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb index 3bf4a667853..0e043e980ac 100644 --- a/spec/serializers/pipeline_serializer_spec.rb +++ b/spec/serializers/pipeline_serializer_spec.rb @@ -97,7 +97,7 @@ describe PipelineSerializer do context 'when used with status' do let(:serializer) do described_class.new(user: user) - .with_status + .only_status end let(:resource) { create(:ci_empty_pipeline) } -- cgit v1.2.3