Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
69da0b75
Commit
69da0b75
authored
Dec 13, 2021
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make badge _matching_branch partial Pajamas-compliant
parent
c3e01ac3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
app/views/projects/protected_branches/shared/_matching_branch.html.haml
...ects/protected_branches/shared/_matching_branch.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/views/projects/protected_branches/shared/_matching_branch.html.haml
View file @
69da0b75
...
...
@@ -3,7 +3,7 @@
=
link_to
matching_branch
.
name
,
project_ref_path
(
@project
,
matching_branch
.
name
),
class:
'ref-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
-
commit
=
@project
.
commit
(
matching_branch
.
name
)
=
link_to
(
commit
.
short_id
,
project_commit_path
(
@project
,
commit
.
id
),
class:
'commit-sha'
)
...
...
locale/gitlab.pot
View file @
69da0b75
...
...
@@ -28415,6 +28415,9 @@ msgstr ""
msgid "ProtectedBranch|What are protected branches?"
msgstr ""
msgid "ProtectedBranch|default"
msgstr ""
msgid "ProtectedEnvironment|%{environment_name} will be writable for developers. Are you sure?"
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment