diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-21 12:07:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-21 12:07:17 +0300 |
| commit | 47a3dc65512c6eb3f88e6ba6842f58db3f03413c (patch) | |
| tree | 024d87f583e6cac0501b781c66a42ff22e34f564 /app/assets/javascripts/pages | |
| parent | 4cd1329b80b80890881be6503958612de3cfdd17 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages')
| -rw-r--r-- | app/assets/javascripts/pages/groups/group_members/index.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/project_members/index.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/groups/group_members/index.js b/app/assets/javascripts/pages/groups/group_members/index.js index 62d47cb49b8..ceda2c8fa17 100644 --- a/app/assets/javascripts/pages/groups/group_members/index.js +++ b/app/assets/javascripts/pages/groups/group_members/index.js @@ -11,7 +11,7 @@ import { groupLinkRequestFormatter } from '~/members/utils'; const SHARED_FIELDS = ['account', 'maxRole', 'expiration', 'actions']; const APP_OPTIONS = { [MEMBER_TYPES.user]: { - tableFields: SHARED_FIELDS.concat(['source', 'granted', 'userCreatedAt', 'lastActivityOn']), + tableFields: SHARED_FIELDS.concat(['source', 'activity']), tableAttrs: { tr: { 'data-qa-selector': 'member_row' } }, tableSortableFields: [ 'account', diff --git a/app/assets/javascripts/pages/projects/project_members/index.js b/app/assets/javascripts/pages/projects/project_members/index.js index 9a7fd74fd8c..2fd372a45b8 100644 --- a/app/assets/javascripts/pages/projects/project_members/index.js +++ b/app/assets/javascripts/pages/projects/project_members/index.js @@ -20,7 +20,7 @@ initImportProjectMembersTrigger(); const SHARED_FIELDS = ['account', 'maxRole', 'expiration', 'actions']; initMembersApp(document.querySelector('.js-project-members-list-app'), { [MEMBER_TYPES.user]: { - tableFields: SHARED_FIELDS.concat(['source', 'granted', 'userCreatedAt', 'lastActivityOn']), + tableFields: SHARED_FIELDS.concat(['source', 'activity']), tableAttrs: { tr: { 'data-qa-selector': 'member_row' } }, tableSortableFields: [ 'account', |