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
cd6c3b3c
Commit
cd6c3b3c
authored
Sep 28, 2021
by
Austin Regnery
Committed by
Peter Hegman
Oct 07, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update branch name to use monospace
Changelog: changed EE: true
parent
87707291
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/assets/javascripts/approvals/components/rule_branches.vue
...assets/javascripts/approvals/components/rule_branches.vue
+1
-1
ee/app/assets/javascripts/status_checks/components/branch.vue
...pp/assets/javascripts/status_checks/components/branch.vue
+1
-1
ee/spec/frontend/approvals/components/rule_branches_spec.js
ee/spec/frontend/approvals/components/rule_branches_spec.js
+2
-2
ee/spec/frontend/status_checks/components/branch_spec.js
ee/spec/frontend/status_checks/components/branch_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/approvals/components/rule_branches.vue
View file @
cd6c3b3c
...
@@ -22,5 +22,5 @@ export default {
...
@@ -22,5 +22,5 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
:class=
"
{ monospace: isAllBranches }">
{{
branchName
}}
</div>
<div
:class=
"
{ monospace:
!
isAllBranches }">
{{
branchName
}}
</div>
</
template
>
</
template
>
ee/app/assets/javascripts/status_checks/components/branch.vue
View file @
cd6c3b3c
...
@@ -21,5 +21,5 @@ export default {
...
@@ -21,5 +21,5 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<span
:class=
"
{ monospace: isAllBranches }">
{{
branchName
}}
</span>
<span
:class=
"
{ monospace:
!
isAllBranches }">
{{
branchName
}}
</span>
</
template
>
</
template
>
ee/spec/frontend/approvals/components/rule_branches_spec.js
View file @
cd6c3b3c
...
@@ -27,7 +27,7 @@ describe('Rule Branches', () => {
...
@@ -27,7 +27,7 @@ describe('Rule Branches', () => {
it
(
'
displays "All branches" if there are no protected branches
'
,
()
=>
{
it
(
'
displays "All branches" if there are no protected branches
'
,
()
=>
{
createComponent
();
createComponent
();
expect
(
findBranch
().
text
()).
toContain
(
'
All branches
'
);
expect
(
findBranch
().
text
()).
toContain
(
'
All branches
'
);
expect
(
findBranch
().
classes
(
'
monospace
'
)).
toBe
(
tru
e
);
expect
(
findBranch
().
classes
(
'
monospace
'
)).
toBe
(
fals
e
);
});
});
it
(
'
displays the branch name of the first protected branch
'
,
()
=>
{
it
(
'
displays the branch name of the first protected branch
'
,
()
=>
{
...
@@ -50,6 +50,6 @@ describe('Rule Branches', () => {
...
@@ -50,6 +50,6 @@ describe('Rule Branches', () => {
expect
(
findBranch
().
text
()).
toContain
(
'
main
'
);
expect
(
findBranch
().
text
()).
toContain
(
'
main
'
);
expect
(
findBranch
().
text
()).
not
.
toContain
(
'
hello
'
);
expect
(
findBranch
().
text
()).
not
.
toContain
(
'
hello
'
);
expect
(
findBranch
().
classes
(
'
monospace
'
)).
toBe
(
fals
e
);
expect
(
findBranch
().
classes
(
'
monospace
'
)).
toBe
(
tru
e
);
});
});
});
});
ee/spec/frontend/status_checks/components/branch_spec.js
View file @
cd6c3b3c
...
@@ -20,13 +20,13 @@ describe('Status checks branch', () => {
...
@@ -20,13 +20,13 @@ describe('Status checks branch', () => {
createWrapper
();
createWrapper
();
expect
(
findBranch
().
text
()).
toBe
(
'
All branches
'
);
expect
(
findBranch
().
text
()).
toBe
(
'
All branches
'
);
expect
(
findBranch
().
classes
(
'
monospace
'
)).
toBe
(
tru
e
);
expect
(
findBranch
().
classes
(
'
monospace
'
)).
toBe
(
fals
e
);
});
});
it
(
'
renders the first branch name when branches are given
'
,
()
=>
{
it
(
'
renders the first branch name when branches are given
'
,
()
=>
{
createWrapper
({
branches
:
[{
name
:
'
Foo
'
},
{
name
:
'
Bar
'
}]
});
createWrapper
({
branches
:
[{
name
:
'
Foo
'
},
{
name
:
'
Bar
'
}]
});
expect
(
findBranch
().
text
()).
toBe
(
'
Foo
'
);
expect
(
findBranch
().
text
()).
toBe
(
'
Foo
'
);
expect
(
findBranch
().
classes
(
'
monospace
'
)).
toBe
(
fals
e
);
expect
(
findBranch
().
classes
(
'
monospace
'
)).
toBe
(
tru
e
);
});
});
});
});
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