diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-14 18:08:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-14 18:08:04 +0300 |
| commit | 8c4225a66b12683bcf1bba9bb9328fcf65395b6d (patch) | |
| tree | d3b583abd26fcbbcbf0db828aee2b940414e1649 /app/assets/javascripts/admin | |
| parent | 075c890053f626018ba680e4da21a93743acb244 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/admin')
| -rw-r--r-- | app/assets/javascripts/admin/users/components/actions/ban.vue | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/admin/users/components/actions/ban.vue b/app/assets/javascripts/admin/users/components/actions/ban.vue index 55938832dce..898a688c203 100644 --- a/app/assets/javascripts/admin/users/components/actions/ban.vue +++ b/app/assets/javascripts/admin/users/components/actions/ban.vue @@ -11,7 +11,9 @@ const messageHtml = ` <ul> <li>${s__("AdminUsers|The user can't log in.")}</li> <li>${s__("AdminUsers|The user can't access git repositories.")}</li> - <li>${s__('AdminUsers|Issues authored by this user are hidden from other users.')}</li> + <li>${s__( + 'AdminUsers|Issues and merge requests authored by this user are hidden from other users.', + )}</li> </ul> <p>${s__('AdminUsers|You can unban their account in the future. Their data remains intact.')}</p> <p>${sprintf( |