Commit 4244baa2 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'pl-callout-enum-comment' into 'master'

Refer to FOSS user callout enum from EE version

See merge request gitlab-org/gitlab!35420
parents 56390db6 e86ed8f8
......@@ -7,6 +7,8 @@ module EE
class_methods do
extend ::Gitlab::Utils::Override
# If you are going to add new items to this hash, check that you're not going
# to conflict with FOSS-only values: https://gitlab.com/gitlab-org/gitlab/blob/master/app/models/user_callout_enums.rb
override :feature_names
def feature_names
super.merge(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment