summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-10 18:30:39 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-23 17:11:49 +0900
commit2b33e9eeb68199f7085102a85c06821b991ecd4d (patch)
tree6ffc72228febe014b3ffe0908cff594f377601ff /app
parent170e54236999aebcdf1508b47a00f9b692b3f8db (diff)
downloadgitlab-ce-2b33e9eeb68199f7085102a85c06821b991ecd4d.tar.gz
with_status to only_status
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/builds_controller.rb2
-rw-r--r--app/controllers/projects/merge_requests_controller.rb2
-rw-r--r--app/controllers/projects/pipelines_controller.rb2
-rw-r--r--app/serializers/build_serializer.rb2
-rw-r--r--app/serializers/pipeline_serializer.rb2
5 files changed, 5 insertions, 5 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