Commit 71bdad34 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch...

Merge branch '344358-make-badges-in-app-views-projects-protected_branches-shared-_matching_branch-html-haml' into 'master'

Make badge _matching_branch partial Pajamas-compliant

See merge request gitlab-org/gitlab!76523
parents 87be392d 69da0b75
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= link_to matching_branch.name, project_ref_path(@project, matching_branch.name), class: 'ref-name' = link_to matching_branch.name, project_ref_path(@project, matching_branch.name), class: 'ref-name'
- if @project.root_ref?(matching_branch.name) - if @project.root_ref?(matching_branch.name)
%span.badge.badge-info.gl-ml-2 default = gl_badge_tag s_('ProtectedBranch|default'), { variant: :info }, { class: 'gl-ml-2' }
%td %td
- commit = @project.commit(matching_branch.name) - commit = @project.commit(matching_branch.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')
......
...@@ -28415,6 +28415,9 @@ msgstr "" ...@@ -28415,6 +28415,9 @@ msgstr ""
msgid "ProtectedBranch|What are protected branches?" msgid "ProtectedBranch|What are protected branches?"
msgstr "" msgstr ""
msgid "ProtectedBranch|default"
msgstr ""
msgid "ProtectedEnvironment|%{environment_name} will be writable for developers. Are you sure?" msgid "ProtectedEnvironment|%{environment_name} will be writable for developers. Are you sure?"
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