diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-05-18 20:05:47 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-05-18 20:41:31 -0300 |
| commit | a355bcac4ba2fda77032f1cb7d88579f77a0ebe6 (patch) | |
| tree | ae81c7d12642fb8a4b224d56fad40736c1764d45 /app/serializers | |
| parent | 7efa0aa02c1590b943028ef12056717b0b078e28 (diff) | |
| download | gitlab-ce-a355bcac4ba2fda77032f1cb7d88579f77a0ebe6.tar.gz | |
Stop loading MergeRequestEntity data on sidebar request
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_basic_entity.rb | 1 | ||||
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_basic_entity.rb b/app/serializers/merge_request_basic_entity.rb index 8771345c135..8461f158bb5 100644 --- a/app/serializers/merge_request_basic_entity.rb +++ b/app/serializers/merge_request_basic_entity.rb @@ -1,4 +1,5 @@ class MergeRequestBasicEntity < Grape::Entity + expose :assignee_id expose :merge_status expose :merge_error expose :state diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index a49f4d834cd..eb9d3861ee7 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -1,7 +1,6 @@ class MergeRequestEntity < IssuableEntity include RequestAwareEntity - expose :assignee_id expose :in_progress_merge_commit_sha expose :locked_at expose :merge_commit_sha |