Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-02 15:08:31 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-02 15:08:31 +0300
commitafbfbfc87abfa006f1d369fdf9c740eb1c826808 (patch)
tree39f6be835193c63660961d536a185711625fe160 /spec/frontend/admin
parent26eb09cbe9c3cc9fc78ad1be7e66e85b5645844b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/admin')
-rw-r--r--spec/frontend/admin/users/constants.js4
-rw-r--r--spec/frontend/admin/users/mock_data.js2
2 files changed, 5 insertions, 1 deletions
diff --git a/spec/frontend/admin/users/constants.js b/spec/frontend/admin/users/constants.js
index 60abdc6c248..b3aa3372b97 100644
--- a/spec/frontend/admin/users/constants.js
+++ b/spec/frontend/admin/users/constants.js
@@ -7,6 +7,8 @@ const ACTIVATE = 'activate';
const DEACTIVATE = 'deactivate';
const REJECT = 'reject';
const APPROVE = 'approve';
+const BAN = 'ban';
+const UNBAN = 'unban';
export const EDIT = 'edit';
@@ -14,6 +16,6 @@ export const LDAP = 'ldapBlocked';
export const LINK_ACTIONS = [APPROVE, REJECT];
-export const CONFIRMATION_ACTIONS = [ACTIVATE, BLOCK, DEACTIVATE, UNLOCK, UNBLOCK];
+export const CONFIRMATION_ACTIONS = [ACTIVATE, BLOCK, DEACTIVATE, UNLOCK, UNBLOCK, BAN, UNBAN];
export const DELETE_ACTIONS = [DELETE, DELETE_WITH_CONTRIBUTIONS];
diff --git a/spec/frontend/admin/users/mock_data.js b/spec/frontend/admin/users/mock_data.js
index 4689ab36773..e7cb4088bf1 100644
--- a/spec/frontend/admin/users/mock_data.js
+++ b/spec/frontend/admin/users/mock_data.js
@@ -30,6 +30,8 @@ export const paths = {
delete: '/admin/users/id',
deleteWithContributions: '/admin/users/id',
adminUser: '/admin/users/id',
+ ban: '/admin/users/id/ban',
+ unban: '/admin/users/id/unban',
};
export const createGroupCountResponse = (groupCounts) => ({