diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
| commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
| tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /app/finders/template_finder.rb | |
| parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders/template_finder.rb')
| -rw-r--r-- | app/finders/template_finder.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/finders/template_finder.rb b/app/finders/template_finder.rb index 3e483716064..dfea3d427c2 100644 --- a/app/finders/template_finder.rb +++ b/app/finders/template_finder.rb @@ -3,6 +3,8 @@ class TemplateFinder include Gitlab::Utils::StrongMemoize + prepend_if_ee('::EE::TemplateFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule + VENDORED_TEMPLATES = HashWithIndifferentAccess.new( dockerfiles: ::Gitlab::Template::DockerfileTemplate, gitignores: ::Gitlab::Template::GitignoreTemplate, |