Commit 04a576e2 authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch...

Merge branch '344385-make-badges-in-app-views-projects-protected_tags-shared-_protected_tag-html-haml-pajamas' into 'master'

Make badge in shared/_protected_tag.html.haml partial Pajamas-compliant

See merge request gitlab-org/gitlab!76751
parents 92b65146 e33c3341
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%span.ref-name= protected_tag.name %span.ref-name= protected_tag.name
- if @project.root_ref?(protected_tag.name) - if @project.root_ref?(protected_tag.name)
%span.badge.badge-info.gl-ml-2 default = gl_badge_tag s_('ProtectedTags|default'), variant: :info, class: 'gl-ml-2'
%td %td
- if protected_tag.wildcard? - if protected_tag.wildcard?
- matching_tags = protected_tag.matching(repository.tags) - matching_tags = protected_tag.matching(repository.tags)
......
...@@ -28558,6 +28558,9 @@ msgstr "" ...@@ -28558,6 +28558,9 @@ msgstr ""
msgid "ProtectedEnvironment|Your environment has been unprotected" msgid "ProtectedEnvironment|Your environment has been unprotected"
msgstr "" msgstr ""
msgid "ProtectedTags|default"
msgstr ""
msgid "ProtectedTag|By default, protected branches restrict who can modify the tag." msgid "ProtectedTag|By default, protected branches restrict who can modify the tag."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment