Add latest changes from gitlab-org/gitlab@master

5 files changed, 23 insertions, 23 deletions

diff --git a/app/assets/javascripts/members/components/avatars/user_avatar.vue b/app/assets/javascripts/members/components/avatars/user_avatar.vue
index fe45ca769af..e2264085e67 100644
--- a/app/assets/javascripts/members/components/avatars/user_avatar.vue
+++ b/app/assets/javascripts/members/components/avatars/user_avatar.vue
@@ -38,7 +38,7 @@ export default {
       return this.member.user;
     },
     badges() {
-      return generateBadges(this.member, this.isCurrentUser).filter(badge => badge.show);
+      return generateBadges(this.member, this.isCurrentUser).filter((badge) => badge.show);
     },
     statusEmoji() {
       return this.user?.status?.emoji;
diff --git a/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue b/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue
index c1df0b94234..cf7501d84fa 100644
--- a/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue
+++ b/app/assets/javascripts/members/components/filter_sort/members_filtered_search_bar.vue
@@ -45,7 +45,7 @@ export default {
   computed: {
     ...mapState(['sourceId', 'filteredSearchBar', 'canManageMembers']),
     tokens() {
-      return this.$options.availableTokens.filter(token => {
+      return this.$options.availableTokens.filter((token) => {
         if (
           Object.prototype.hasOwnProperty.call(token, 'requiredPermissions') &&
           !this[token.requiredPermissions]
@@ -61,8 +61,8 @@ export default {
     const query = queryToObject(window.location.search);
 
     const tokens = this.tokens
-      .filter(token => query[token.type])
-      .map(token => ({
+      .filter((token) => query[token.type])
+      .map((token) => ({
         type: token.type,
         value: {
           data: query[token.type],
diff --git a/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue b/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue
index de7fbc4241c..bcfe559768d 100644
--- a/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue
+++ b/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue
@@ -14,7 +14,7 @@ export default {
       return parseSortParam(this.tableSortableFields);
     },
     activeOption() {
-      return FIELDS.find(field => field.key === this.sort.sortByKey);
+      return FIELDS.find((field) => field.key === this.sort.sortByKey);
     },
     activeOptionLabel() {
       return this.activeOption?.label;
@@ -23,18 +23,18 @@ export default {
       return !this.sort.sortDesc;
     },
     filteredOptions() {
-      return FIELDS.filter(field => this.tableSortableFields.includes(field.key) && field.sort).map(
-        field => ({
-          key: field.key,
-          label: field.label,
-          href: buildSortHref({
-            sortBy: field.key,
-            sortDesc: false,
-            filteredSearchBarTokens: this.filteredSearchBar.tokens,
-            filteredSearchBarSearchParam: this.filteredSearchBar.searchParam,
-          }),
+      return FIELDS.filter(
+        (field) => this.tableSortableFields.includes(field.key) && field.sort,
+      ).map((field) => ({
+        key: field.key,
+        label: field.label,
+        href: buildSortHref({
+          sortBy: field.key,
+          sortDesc: false,
+          filteredSearchBarTokens: this.filteredSearchBar.tokens,
+          filteredSearchBarSearchParam: this.filteredSearchBar.searchParam,
         }),
-      );
+      }));
     },
   },
   methods: {
diff --git a/app/assets/javascripts/members/store/index.js b/app/assets/javascripts/members/store/index.js
index f219f8931b0..34c102999d2 100644
--- a/app/assets/javascripts/members/store/index.js
+++ b/app/assets/javascripts/members/store/index.js
@@ -2,7 +2,7 @@ import createState from 'ee_else_ce/members/store/state';
 import mutations from 'ee_else_ce/members/store/mutations';
 import * as actions from 'ee_else_ce/members/store/actions';
 
-export default initialState => ({
+export default (initialState) => ({
   state: createState(initialState),
   actions,
   mutations,
diff --git a/app/assets/javascripts/members/utils.js b/app/assets/javascripts/members/utils.js
index bf1fc2d7515..780b5a9df57 100644
--- a/app/assets/javascripts/members/utils.js
+++ b/app/assets/javascripts/members/utils.js
@@ -21,7 +21,7 @@ export const generateBadges = (member, isCurrentUser) => [
   },
 ];
 
-export const isGroup = member => {
+export const isGroup = (member) => {
   return Boolean(member.sharedWithGroup);
 };
 
@@ -37,7 +37,7 @@ export const canRemove = (member, sourceId) => {
   return isDirectMember(member, sourceId) && member.canRemove;
 };
 
-export const canResend = member => {
+export const canResend = (member) => {
   return Boolean(member.invite?.canResend);
 };
 
@@ -47,11 +47,11 @@ export const canUpdate = (member, currentUserId, sourceId) => {
   );
 };
 
-export const parseSortParam = sortableFields => {
+export const parseSortParam = (sortableFields) => {
   const sortParam = getParameterByName('sort');
 
-  const sortedField = FIELDS.filter(field => sortableFields.includes(field.key)).find(
-    field => field.sort?.asc === sortParam || field.sort?.desc === sortParam,
+  const sortedField = FIELDS.filter((field) => sortableFields.includes(field.key)).find(
+    (field) => field.sort?.asc === sortParam || field.sort?.desc === sortParam,
   );
 
   if (!sortedField) {
@@ -70,7 +70,7 @@ export const buildSortHref = ({
   filteredSearchBarTokens,
   filteredSearchBarSearchParam,
 }) => {
-  const sortDefinition = FIELDS.find(field => field.key === sortBy)?.sort;
+  const sortDefinition = FIELDS.find((field) => field.key === sortBy)?.sort;
 
   if (!sortDefinition) {
     return '';