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
282234a4
Commit
282234a4
authored
Mar 29, 2021
by
Taurie Davis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deprecate btn-warning on admin area delete user modal
parent
c84d9415
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
8 deletions
+13
-8
app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
...cripts/pages/admin/users/components/delete_user_modal.vue
+2
-2
changelogs/unreleased/326038-delete-user-modal.yml
changelogs/unreleased/326038-delete-user-modal.yml
+5
-0
spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
...s/components/__snapshots__/delete_user_modal_spec.js.snap
+2
-2
spec/frontend/pages/admin/users/components/delete_user_modal_spec.js
...nd/pages/admin/users/components/delete_user_modal_spec.js
+4
-4
No files found.
app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
View file @
282234a4
...
...
@@ -119,8 +119,8 @@ export default {
<gl-button
@
click=
"onCancel"
>
{{
s__
(
'
Cancel
'
)
}}
</gl-button>
<gl-button
:disabled=
"!canSubmit"
category=
"
prim
ary"
variant=
"
warning
"
category=
"
second
ary"
variant=
"
danger
"
@
click=
"onSecondaryAction"
>
{{
secondaryAction
}}
...
...
changelogs/unreleased/326038-delete-user-modal.yml
0 → 100644
View file @
282234a4
---
title
:
Deprecate btn-warning on admin area delete user modal
merge_request
:
57761
author
:
type
:
changed
spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
View file @
282234a4
...
...
@@ -50,11 +50,11 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
<gl-button-stub
buttontextclasses=""
category="
prim
ary"
category="
second
ary"
disabled="true"
icon=""
size="medium"
variant="
warning
"
variant="
danger
"
>
secondaryAction
...
...
spec/frontend/pages/admin/users/components/delete_user_modal_spec.js
View file @
282234a4
...
...
@@ -11,15 +11,15 @@ describe('User Operation confirmation modal', () => {
let
wrapper
;
let
formSubmitSpy
;
const
findButton
=
(
variant
)
=>
const
findButton
=
(
category
)
=>
wrapper
.
findAll
(
GlButton
)
.
filter
((
w
)
=>
w
.
attributes
(
'
variant
'
)
===
variant
)
.
filter
((
w
)
=>
w
.
attributes
(
'
category
'
)
===
category
)
.
at
(
0
);
const
findForm
=
()
=>
wrapper
.
find
(
'
form
'
);
const
findUsernameInput
=
()
=>
wrapper
.
find
(
GlFormInput
);
const
findPrimaryButton
=
()
=>
findButton
(
'
danger
'
);
const
findSecondaryButton
=
()
=>
findButton
(
'
warning
'
);
const
findPrimaryButton
=
()
=>
findButton
(
'
primary
'
);
const
findSecondaryButton
=
()
=>
findButton
(
'
secondary
'
);
const
findAuthenticityToken
=
()
=>
new
FormData
(
findForm
().
element
).
get
(
'
authenticity_token
'
);
const
getUsername
=
()
=>
findUsernameInput
().
attributes
(
'
value
'
);
const
getMethodParam
=
()
=>
new
FormData
(
findForm
().
element
).
get
(
'
_method
'
);
...
...
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