diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-04 07:33:05 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-04 07:33:05 +0000 |
| commit | 2ee93c486cfbdf5555677d570cc63d1542c159ba (patch) | |
| tree | 269fb45d8daf58258be607fab36118ab73590e8e /app/serializers | |
| parent | aaa57c9d35b1eb744fca970263220850db06639f (diff) | |
| parent | 1f54c9216f178e96010b28a74f04bae5848ef15d (diff) | |
| download | gitlab-ce-2ee93c486cfbdf5555677d570cc63d1542c159ba.tar.gz | |
Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'
Reduce method calls while evaluating Projects::MergeRequestsController#show.json
See merge request gitlab-org/gitlab-ce!14285
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index 7d3c752b8e6..36537c5bd02 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -23,7 +23,6 @@ class MergeRequestEntity < IssuableEntity expose :closed_event, using: EventEntity # User entities - expose :author, using: UserEntity expose :merge_user, using: UserEntity # Diff sha's @@ -31,7 +30,6 @@ class MergeRequestEntity < IssuableEntity merge_request.diff_head_sha if merge_request.diff_head_commit end - expose :merge_commit_sha expose :merge_commit_message expose :head_pipeline, with: PipelineDetailsEntity, as: :pipeline |