summaryrefslogtreecommitdiff
path: root/app/helpers/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-05 03:10:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-05 03:10:58 +0000
commitaf7f4b8c377191ca243a673034ee85264353cf95 (patch)
tree6f0898197899eab78f8e9a92d604326136ecffe3 /app/helpers/projects
parent14497073dcf5ee76f9bbc169b4713c511b003faa (diff)
downloadgitlab-ce-af7f4b8c377191ca243a673034ee85264353cf95.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/projects')
-rw-r--r--app/helpers/projects/incidents_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/projects/incidents_helper.rb b/app/helpers/projects/incidents_helper.rb
index fbadcef5184..3b494ec2472 100644
--- a/app/helpers/projects/incidents_helper.rb
+++ b/app/helpers/projects/incidents_helper.rb
@@ -10,3 +10,5 @@ module Projects::IncidentsHelper
}
end
end
+
+Projects::IncidentsHelper.prepend_if_ee('EE::Projects::IncidentsHelper')