diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-12 06:10:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-12 06:10:17 +0300 |
| commit | 737684a392db1178770ad5b1d20b64386aadcac5 (patch) | |
| tree | a5b304cf7cd4d0c41ad3bde432d20edd7d79257d /app/finders/template_finder.rb | |
| parent | 80ddaef34dd357706187bd888b34e7ca1d5c30ba (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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/finders/template_finder.rb b/app/finders/template_finder.rb index 9f7fca154ec..a35376e905e 100644 --- a/app/finders/template_finder.rb +++ b/app/finders/template_finder.rb @@ -7,7 +7,9 @@ class TemplateFinder dockerfiles: ::Gitlab::Template::DockerfileTemplate, gitignores: ::Gitlab::Template::GitignoreTemplate, gitlab_ci_ymls: ::Gitlab::Template::GitlabCiYmlTemplate, - metrics_dashboard_ymls: ::Gitlab::Template::MetricsDashboardTemplate + metrics_dashboard_ymls: ::Gitlab::Template::MetricsDashboardTemplate, + issues: ::Gitlab::Template::IssueTemplate, + merge_requests: ::Gitlab::Template::MergeRequestTemplate ).freeze class << self @@ -35,9 +37,9 @@ class TemplateFinder def execute if params[:name] - vendored_templates.find(params[:name]) + vendored_templates.find(params[:name], project) else - vendored_templates.all + vendored_templates.all(project) end end end |