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
b7a31605
Commit
b7a31605
authored
Feb 28, 2022
by
Justin Mandell
Committed by
Jose Ivan Vargas
Feb 28, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Swap primary for secondary buttons in Security Configure page
parent
4efdb904
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app/assets/javascripts/security_configuration/components/feature_card.vue
...cripts/security_configuration/components/feature_card.vue
+2
-3
spec/frontend/security_configuration/components/feature_card_spec.js
...nd/security_configuration/components/feature_card_spec.js
+1
-1
No files found.
app/assets/javascripts/security_configuration/components/feature_card.vue
View file @
b7a31605
...
...
@@ -31,13 +31,12 @@ export default {
const
button
=
this
.
enabled
?
{
text
:
this
.
$options
.
i18n
.
configureFeature
,
category
:
'
secondary
'
,
}
:
{
text
:
this
.
$options
.
i18n
.
enableFeature
,
category
:
'
primary
'
,
};
button
.
category
=
'
secondary
'
;
button
.
text
=
sprintf
(
button
.
text
,
{
feature
:
this
.
shortName
});
return
button
;
...
...
@@ -126,7 +125,7 @@ export default {
v-else-if=
"showManageViaMr"
:feature=
"feature"
variant=
"confirm"
category=
"
prim
ary"
category=
"
second
ary"
class=
"gl-mt-5"
:data-qa-selector=
"`$
{feature.type}_mr_button`"
@error="onError"
...
...
spec/frontend/security_configuration/components/feature_card_spec.js
View file @
b7a31605
...
...
@@ -50,7 +50,7 @@ describe('FeatureCard component', () => {
expect(enableLinks.exists()).toBe(expectEnableAction);
if (expectEnableAction) {
expect(enableLinks).toHaveLength(1);
expect(enableLinks.at(0).props('category')).toBe('
prim
ary');
expect(enableLinks.at(0).props('category')).toBe('
second
ary');
}
const configureLinks = findConfigureLinks();
...
...
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