summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 09:09:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 09:09:31 +0000
commit6763d2787670bc03a36a8eb601703e88fc70dece (patch)
treeedc653ffd3052e3f9898c4fa8a07621d51574767 /lib
parented9165c2abda1dca048a8d3cb8030d906c0bbb0c (diff)
downloadgitlab-ce-6763d2787670bc03a36a8eb601703e88fc70dece.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/background_migration/user_mentions/models/note.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/background_migration/user_mentions/models/note.rb b/lib/gitlab/background_migration/user_mentions/models/note.rb
index 7a1a0223bc7..c32292ad704 100644
--- a/lib/gitlab/background_migration/user_mentions/models/note.rb
+++ b/lib/gitlab/background_migration/user_mentions/models/note.rb
@@ -24,7 +24,7 @@ module Gitlab
end
def for_project_noteable?
- !for_personal_snippet?
+ !for_personal_snippet? && !for_epic?
end
def skip_project_check?