summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-12-01 11:26:51 -0200
committerFelipe Artur <felipefac@gmail.com>2017-12-05 12:54:10 -0200
commit5cf3ff27c8f955e701837529d72a070697a41a04 (patch)
tree77fe5f9413941353b87157fc0a55323844fd3c22 /app/serializers
parentf586dc0735545d96d73dd26ff182ddf2d50dd715 (diff)
downloadgitlab-ce-5cf3ff27c8f955e701837529d72a070697a41a04.tar.gz
Use actual head pipeline on merge request serializer
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/merge_request_entity.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb
index b53a49fe59e..eece9445dca 100644
--- a/app/serializers/merge_request_entity.rb
+++ b/app/serializers/merge_request_entity.rb
@@ -33,7 +33,7 @@ class MergeRequestEntity < IssuableEntity
end
expose :merge_commit_message
- expose :head_pipeline, with: PipelineDetailsEntity, as: :pipeline
+ expose :actual_head_pipeline, with: PipelineDetailsEntity, as: :pipeline
# Booleans
expose :merge_ongoing?, as: :merge_ongoing