diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-13 21:16:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-13 21:16:51 +0300 |
| commit | aa072fd68cfe366c0d5968c65e9b42aecb2a75b5 (patch) | |
| tree | a7b51bab61941464115c84beff0d11ecf2a582ee /app/views/projects/protected_tags | |
| parent | bd5ff5cb6553dd8f168b28c97175a63250fe2ab2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/protected_tags')
| -rw-r--r-- | app/views/projects/protected_tags/shared/_protected_tag.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/protected_tags/shared/_tags_list.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/protected_tags/shared/_protected_tag.html.haml b/app/views/projects/protected_tags/shared/_protected_tag.html.haml index 70357f39e44..b312a09aadd 100644 --- a/app/views/projects/protected_tags/shared/_protected_tag.html.haml +++ b/app/views/projects/protected_tags/shared/_protected_tag.html.haml @@ -6,7 +6,7 @@ = gl_badge_tag s_('ProtectedTags|default'), variant: :info, class: 'gl-ml-2' %td - if protected_tag.wildcard? - - matching_tags = protected_tag.matching(repository.tags) + - matching_tags = protected_tag.matching(repository.tag_names) = link_to pluralize(matching_tags.count, "matching tag"), project_protected_tag_path(@project, protected_tag) - else - if commit = protected_tag.commit diff --git a/app/views/projects/protected_tags/shared/_tags_list.html.haml b/app/views/projects/protected_tags/shared/_tags_list.html.haml index f3cf4013898..5f3ea281278 100644 --- a/app/views/projects/protected_tags/shared/_tags_list.html.haml +++ b/app/views/projects/protected_tags/shared/_tags_list.html.haml @@ -1,7 +1,7 @@ .protected-tags-list.js-protected-tags-list - if @protected_tags.empty? .card-header - Protected tags (#{@protected_tags_count}) + Protected tags (0) %p.settings-message.text-center No tags are protected. - else |