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
f8466bc5
Commit
f8466bc5
authored
Jul 14, 2021
by
Olena Horal-Koretska
Committed by
Kushal Pandya
Jul 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix escaped chars in remove and delete modals
parent
14f4b2e5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
6 deletions
+12
-6
app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue
...members/components/action_buttons/user_action_buttons.vue
+1
-0
app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
...cripts/pages/admin/users/components/delete_user_modal.vue
+2
-2
app/assets/javascripts/vue_shared/components/oncall_schedules_list.vue
...vascripts/vue_shared/components/oncall_schedules_list.vue
+7
-3
spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
...s/components/__snapshots__/delete_user_modal_spec.js.snap
+1
-0
spec/frontend/vue_shared/oncall_schedules_list_spec.js
spec/frontend/vue_shared/oncall_schedules_list_spec.js
+1
-1
No files found.
app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue
View file @
f8466bc5
...
...
@@ -38,6 +38,7 @@ export default {
usersName
:
user
.
name
,
source
:
source
.
fullName
,
},
false
,
);
}
...
...
app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
View file @
f8466bc5
...
...
@@ -58,7 +58,7 @@ export default {
},
computed
:
{
modalTitle
()
{
return
sprintf
(
this
.
title
,
{
username
:
this
.
username
});
return
sprintf
(
this
.
title
,
{
username
:
this
.
username
}
,
false
);
},
secondaryButtonLabel
()
{
return
s__
(
'
AdminUsers|Block user
'
);
...
...
@@ -112,7 +112,7 @@ export default {
</gl-sprintf>
</p>
<oncall-schedules-list
v-if=
"schedules.length"
:schedules=
"schedules"
/>
<oncall-schedules-list
v-if=
"schedules.length"
:schedules=
"schedules"
:user-name=
"username"
/>
<p>
<gl-sprintf
:message=
"s__('AdminUsers|To confirm, type %{username}')"
>
...
...
app/assets/javascripts/vue_shared/components/oncall_schedules_list.vue
View file @
f8466bc5
...
...
@@ -27,9 +27,13 @@ export default {
title
()
{
return
this
.
isCurrentUser
?
s__
(
'
OnCallSchedules|You are currently a part of:
'
)
:
sprintf
(
s__
(
'
OnCallSchedules|User %{name} is currently part of:
'
),
{
name
:
this
.
userName
,
});
:
sprintf
(
s__
(
'
OnCallSchedules|User %{name} is currently part of:
'
),
{
name
:
this
.
userName
,
},
false
,
);
},
footer
()
{
return
this
.
isCurrentUser
...
...
spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
View file @
f8466bc5
...
...
@@ -10,6 +10,7 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
<oncall-schedules-list-stub
schedules="schedule1,schedule2"
username="username"
/>
<p>
...
...
spec/frontend/vue_shared/oncall_schedules_list_spec.js
View file @
f8466bc5
...
...
@@ -18,7 +18,7 @@ const mockSchedules = [
},
];
const
userName
=
'
User 1
'
;
const
userName
=
"
O'User
"
;
describe
(
'
On-call schedules list
'
,
()
=>
{
let
wrapper
;
...
...
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