Commit 0a76dd5c authored by Mark Florian's avatar Mark Florian

Merge branch...

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

Make badge in _matching_tag partial Pajamas-compliant

See merge request gitlab-org/gitlab!76552
parents 36420d47 2ce21565
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= link_to matching_tag.name, project_ref_path(@project, matching_tag.name), class: 'ref-name' = link_to matching_tag.name, project_ref_path(@project, matching_tag.name), class: 'ref-name'
- if @project.root_ref?(matching_tag.name) - if @project.root_ref?(matching_tag.name)
%span.badge.badge-info.gl-ml-2 default = gl_badge_tag s_('ProtectedTag|default'), { variant: :info }, { class: 'gl-ml-2' }
%td %td
- commit = @project.commit(matching_tag.name) - commit = @project.commit(matching_tag.name)
= link_to(commit.short_id, project_commit_path(@project, commit.id), class: 'commit-sha') = link_to(commit.short_id, project_commit_path(@project, commit.id), class: 'commit-sha')
......
...@@ -28475,6 +28475,9 @@ msgstr "" ...@@ -28475,6 +28475,9 @@ msgstr ""
msgid "ProtectedTag|What are protected tags?" msgid "ProtectedTag|What are protected tags?"
msgstr "" msgstr ""
msgid "ProtectedTag|default"
msgstr ""
msgid "Protip: %{linkStart}Auto DevOps%{linkEnd} uses Kubernetes clusters to deploy your code!" msgid "Protip: %{linkStart}Auto DevOps%{linkEnd} uses Kubernetes clusters to deploy your code!"
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