diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 03:10:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-22 03:10:49 +0300 |
| commit | 1b3785910ee36281a08f968e0ac1af892bb96dd0 (patch) | |
| tree | 2a8fceb99ad2dc44a368b1908022b3a2afb7e834 /lib/gitlab/template | |
| parent | 392db89b03f7ffd6e3327015cd05a1a446f22da1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/template')
| -rw-r--r-- | lib/gitlab/template/base_template.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/template/issue_template.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/template/merge_request_template.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/template/base_template.rb b/lib/gitlab/template/base_template.rb index 5b5dab29d09..dc006877129 100644 --- a/lib/gitlab/template/base_template.rb +++ b/lib/gitlab/template/base_template.rb @@ -108,7 +108,7 @@ module Gitlab # Gitaly the actual template names within a given project's repository for all file templates # other than `issue` and `merge request` description templates, which would instead # overwrite the `template_names` method to return a redis cached version, by reading cached values - # from `repository.issue_template_names_by_category` and `repository.merge_request_template_names_by_category` + # from `repository.issue_template_names_hash` and `repository.merge_request_template_names_hash` # methods. def repository_template_names(project) template_names_by_category(self.all(project)) diff --git a/lib/gitlab/template/issue_template.rb b/lib/gitlab/template/issue_template.rb index 916fc669a07..6e579018e45 100644 --- a/lib/gitlab/template/issue_template.rb +++ b/lib/gitlab/template/issue_template.rb @@ -23,7 +23,7 @@ module Gitlab # own caching mechanism to avoid the back and forth call jumps between finder and model. # # follow-up issue: https://gitlab.com/gitlab-org/gitlab/-/issues/300279 - project.repository.issue_template_names_by_category + project.repository.issue_template_names_hash end def by_category(category, project = nil, empty_category_title: nil) diff --git a/lib/gitlab/template/merge_request_template.rb b/lib/gitlab/template/merge_request_template.rb index 81dea4d031b..241a823d870 100644 --- a/lib/gitlab/template/merge_request_template.rb +++ b/lib/gitlab/template/merge_request_template.rb @@ -23,7 +23,7 @@ module Gitlab # own caching mechanism to avoid the back and forth call jumps between finder and model. # # follow-up issue: https://gitlab.com/gitlab-org/gitlab/-/issues/300279 - project.repository.merge_request_template_names_by_category + project.repository.merge_request_template_names_hash end def by_category(category, project = nil, empty_category_title: nil) |