summaryrefslogtreecommitdiff
path: root/app/serializers/discussion_serializer.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 13:26:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 13:26:31 +0000
commitb7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch)
tree5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/serializers/discussion_serializer.rb
parent25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff)
downloadgitlab-ce-b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/discussion_serializer.rb')
-rw-r--r--app/serializers/discussion_serializer.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/serializers/discussion_serializer.rb b/app/serializers/discussion_serializer.rb
index 8bb7e93c033..7e7148b046e 100644
--- a/app/serializers/discussion_serializer.rb
+++ b/app/serializers/discussion_serializer.rb
@@ -17,3 +17,5 @@ class DiscussionSerializer < BaseSerializer
opts.merge(additional_opts)
end
end
+
+DiscussionSerializer.prepend_if_ee('EE::DiscussionSerializer')