summaryrefslogtreecommitdiff
path: root/app/models/discussion_note.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/models/discussion_note.rb
parent25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff)
downloadgitlab-ce-b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/discussion_note.rb')
-rw-r--r--app/models/discussion_note.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/discussion_note.rb b/app/models/discussion_note.rb
index 142cbdcdfa6..5049107da2c 100644
--- a/app/models/discussion_note.rb
+++ b/app/models/discussion_note.rb
@@ -4,6 +4,9 @@
#
# A note of this type can be resolvable.
class DiscussionNote < Note
+ # This prepend must stay here because the `validates` below depends on it.
+ prepend_if_ee('EE::DiscussionNote') # rubocop: disable Cop/InjectEnterpriseEditionModule
+
# Names of all implementers of `Noteable` that support discussions.
def self.noteable_types
%w(MergeRequest Issue Commit Snippet)