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
b85df409
Commit
b85df409
authored
Aug 20, 2020
by
André Luís
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use gl-font-monospace and fix typo in changelog
parent
02bcb6b7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue
...ge_request_widget/components/approvals/approvals_list.vue
+1
-1
ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml
.../unreleased/238418-fix-approval-rules-bursting-layout.yml
+1
-1
ee/spec/features/merge_request/user_sees_approval_widget_spec.rb
.../features/merge_request/user_sees_approval_widget_spec.rb
+2
-2
ee/spec/frontend/vue_mr_widget/components/approvals/approvals_list_spec.js
...vue_mr_widget/components/approvals/approvals_list_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue
View file @
b85df409
...
...
@@ -46,7 +46,7 @@ export default {
rules
:
orderBy
(
this
.
approvalRules
.
filter
(
rule
=>
rule
.
rule_type
===
RULE_TYPE_CODE_OWNER
)
.
map
(
rule
=>
({
...
rule
,
nameClass
:
'
monospace gl-word-break-all
'
})),
.
map
(
rule
=>
({
...
rule
,
nameClass
:
'
gl-font-
monospace gl-word-break-all
'
})),
[
o
=>
o
.
section
===
'
codeowners
'
,
'
name
'
,
'
section
'
],
[
'
desc
'
,
'
asc
'
,
'
asc
'
],
),
...
...
ee/changelogs/unreleased/238418-fix-approval-rules-bursting-layout.yml
View file @
b85df409
---
title
:
Fix Approval Rules table in Merge Requests b
ru
sting out of the layout in some
title
:
Fix Approval Rules table in Merge Requests b
ur
sting out of the layout in some
scenarios
merge_request
:
39753
author
:
...
...
ee/spec/features/merge_request/user_sees_approval_widget_spec.rb
View file @
b85df409
...
...
@@ -99,7 +99,7 @@ RSpec.describe 'Merge request > User sees approval widget', :js do
click_on
'View eligible approvers'
wait_for_requests
within
(
'.mr-widget-workflow table .monospace'
)
do
within
(
'.mr-widget-workflow table .
gl-font-
monospace'
)
do
code_owner_row
=
find
(
:xpath
,
"//tr[td[contains(.,'
#{
code_owner_rule
.
name
}
')]]"
)
expect
(
code_owner_row
).
to
have_content
(
'Optional'
)
...
...
@@ -123,7 +123,7 @@ RSpec.describe 'Merge request > User sees approval widget', :js do
click_on
'View eligible approvers'
wait_for_requests
within
(
'.mr-widget-workflow table .monospace'
)
do
within
(
'.mr-widget-workflow table .
gl-font-
monospace'
)
do
code_owner_row
=
find
(
:xpath
,
"//tr[td[contains(.,'
#{
code_owner_rule
.
name
}
')]]"
)
expect
(
code_owner_row
).
to
have_content
(
'0 of 1'
)
...
...
ee/spec/frontend/vue_mr_widget/components/approvals/approvals_list_spec.js
View file @
b85df409
...
...
@@ -350,7 +350,7 @@ describe('EE MRWidget approvals list', () => {
it
(
'
renders the name in a monospace font
'
,
()
=>
{
const
codeOwnerRow
=
findRowElement
(
row
,
'
name
'
);
expect
(
codeOwnerRow
.
find
(
'
.monospace
'
).
exists
()).
toEqual
(
true
);
expect
(
codeOwnerRow
.
find
(
'
.
gl-font-
monospace
'
).
exists
()).
toEqual
(
true
);
expect
(
codeOwnerRow
.
text
()).
toContain
(
rule
.
name
);
});
...
...
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