summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-28 09:08:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-28 09:08:19 +0000
commit79659fe1fe45f2bdd13cd1a3980fbf1714caad57 (patch)
tree6dc2d9e7a3543d5346337c5056331c70f736e950 /app/serializers
parent6047d21a899cba25dfb554cca1776fed689dc951 (diff)
downloadgitlab-ce-79659fe1fe45f2bdd13cd1a3980fbf1714caad57.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/merge_request_diff_entity.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/serializers/merge_request_diff_entity.rb b/app/serializers/merge_request_diff_entity.rb
index 02b81b707b9..e197c3d0fbb 100644
--- a/app/serializers/merge_request_diff_entity.rb
+++ b/app/serializers/merge_request_diff_entity.rb
@@ -16,7 +16,6 @@ class MergeRequestDiffEntity < Grape::Entity
end
expose :created_at
- expose :state
expose :commits_count
expose :latest?, as: :latest