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>2020-12-24 03:10:25 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-24 03:10:25 +0300
commitb2e2c43b3c5aebf47d7f6114b172551e4fa97e58 (patch)
tree5358eb8e4b7fa85f87f13524ab520b460a62ce24 /app/assets/javascripts/groups
parent5838993b5f3e2d861d9dd7c82dfeea71506b9fc2 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
-rw-r--r--app/assets/javascripts/groups/components/app.vue12
-rw-r--r--app/assets/javascripts/groups/components/visibility_level_dropdown.vue2
-rw-r--r--app/assets/javascripts/groups/init_invite_members_banner.js2
-rw-r--r--app/assets/javascripts/groups/members/index.js2
-rw-r--r--app/assets/javascripts/groups/members/utils.js2
-rw-r--r--app/assets/javascripts/groups/store/groups_store.js12
-rw-r--r--app/assets/javascripts/groups/transfer_dropdown.js6
7 files changed, 19 insertions, 19 deletions
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue
index e057012a246..ac36d284384 100644
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@@ -108,7 +108,7 @@ export default {
fetchGroups({ parentId, page, filterGroupsBy, sortBy, archived, updatePagination }) {
return this.service
.getGroups(parentId, page, filterGroupsBy, sortBy, archived)
- .then(res => {
+ .then((res) => {
if (updatePagination) {
this.updatePagination(res.headers);
}
@@ -135,7 +135,7 @@ export default {
sortBy,
archived,
updatePagination: true,
- }).then(res => {
+ }).then((res) => {
this.isLoading = false;
this.updateGroups(res, Boolean(filterGroupsBy));
});
@@ -149,7 +149,7 @@ export default {
sortBy,
archived,
updatePagination: true,
- }).then(res => {
+ }).then((res) => {
this.isLoading = false;
$.scrollTo(0);
@@ -173,7 +173,7 @@ export default {
this.fetchGroups({
parentId: parentGroup.id,
})
- .then(res => {
+ .then((res) => {
this.store.setGroupChildren(parentGroup, res);
})
.catch(() => {
@@ -194,12 +194,12 @@ export default {
this.targetGroup.isBeingRemoved = true;
this.service
.leaveGroup(this.targetGroup.leavePath)
- .then(res => {
+ .then((res) => {
$.scrollTo(0);
this.store.removeGroup(this.targetGroup, this.targetParentGroup);
this.$toast.show(res.data.notice);
})
- .catch(err => {
+ .catch((err) => {
let message = COMMON_STR.FAILURE;
if (err.status === 403) {
message = COMMON_STR.LEAVE_FORBIDDEN;
diff --git a/app/assets/javascripts/groups/components/visibility_level_dropdown.vue b/app/assets/javascripts/groups/components/visibility_level_dropdown.vue
index ff0f8c3ff46..0933045fc38 100644
--- a/app/assets/javascripts/groups/components/visibility_level_dropdown.vue
+++ b/app/assets/javascripts/groups/components/visibility_level_dropdown.vue
@@ -23,7 +23,7 @@ export default {
},
methods: {
getDefaultOption() {
- return this.visibilityLevelOptions.find(option => option.level === this.defaultLevel);
+ return this.visibilityLevelOptions.find((option) => option.level === this.defaultLevel);
},
onClick(option) {
this.selectedOption = option;
diff --git a/app/assets/javascripts/groups/init_invite_members_banner.js b/app/assets/javascripts/groups/init_invite_members_banner.js
index c7967827917..2052dd6ac8c 100644
--- a/app/assets/javascripts/groups/init_invite_members_banner.js
+++ b/app/assets/javascripts/groups/init_invite_members_banner.js
@@ -18,6 +18,6 @@ export default function initInviteMembersBanner() {
isDismissedKey,
trackLabel,
},
- render: createElement => createElement(InviteMembersBanner),
+ render: (createElement) => createElement(InviteMembersBanner),
});
}
diff --git a/app/assets/javascripts/groups/members/index.js b/app/assets/javascripts/groups/members/index.js
index 9ce0e3c1179..3ec874b8d36 100644
--- a/app/assets/javascripts/groups/members/index.js
+++ b/app/assets/javascripts/groups/members/index.js
@@ -38,6 +38,6 @@ export const initGroupMembersApp = (
el,
components: { App },
store,
- render: createElement => createElement('app'),
+ render: (createElement) => createElement('app'),
});
};
diff --git a/app/assets/javascripts/groups/members/utils.js b/app/assets/javascripts/groups/members/utils.js
index 2d584556bbc..4fcf348b69f 100644
--- a/app/assets/javascripts/groups/members/utils.js
+++ b/app/assets/javascripts/groups/members/utils.js
@@ -7,7 +7,7 @@ import {
GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME,
} from './constants';
-export const parseDataAttributes = el => {
+export const parseDataAttributes = (el) => {
const { members, groupId, memberPath, canManageMembers } = el.dataset;
return {
diff --git a/app/assets/javascripts/groups/store/groups_store.js b/app/assets/javascripts/groups/store/groups_store.js
index b6cea38e87f..6cf70f4052e 100644
--- a/app/assets/javascripts/groups/store/groups_store.js
+++ b/app/assets/javascripts/groups/store/groups_store.js
@@ -12,15 +12,15 @@ export default class GroupsStore {
setGroups(rawGroups) {
if (rawGroups && rawGroups.length) {
- this.state.groups = rawGroups.map(rawGroup => this.formatGroupItem(rawGroup));
+ this.state.groups = rawGroups.map((rawGroup) => this.formatGroupItem(rawGroup));
} else {
this.state.groups = [];
}
}
setSearchedGroups(rawGroups) {
- const formatGroups = groups =>
- groups.map(group => {
+ const formatGroups = (groups) =>
+ groups.map((group) => {
const formattedGroup = this.formatGroupItem(group);
if (formattedGroup.children && formattedGroup.children.length) {
formattedGroup.children = formatGroups(formattedGroup.children);
@@ -37,7 +37,7 @@ export default class GroupsStore {
setGroupChildren(parentGroup, children) {
const updatedParentGroup = parentGroup;
- updatedParentGroup.children = children.map(rawChild => this.formatGroupItem(rawChild));
+ updatedParentGroup.children = children.map((rawChild) => this.formatGroupItem(rawChild));
updatedParentGroup.isOpen = true;
updatedParentGroup.isChildrenLoading = false;
}
@@ -103,9 +103,9 @@ export default class GroupsStore {
removeGroup(group, parentGroup) {
const updatedParentGroup = parentGroup;
if (updatedParentGroup.children && updatedParentGroup.children.length) {
- updatedParentGroup.children = parentGroup.children.filter(child => group.id !== child.id);
+ updatedParentGroup.children = parentGroup.children.filter((child) => group.id !== child.id);
} else {
- this.state.groups = this.state.groups.filter(child => group.id !== child.id);
+ this.state.groups = this.state.groups.filter((child) => group.id !== child.id);
}
}
}
diff --git a/app/assets/javascripts/groups/transfer_dropdown.js b/app/assets/javascripts/groups/transfer_dropdown.js
index cefd803c631..59cc779d2ae 100644
--- a/app/assets/javascripts/groups/transfer_dropdown.js
+++ b/app/assets/javascripts/groups/transfer_dropdown.js
@@ -20,11 +20,11 @@ export default class TransferDropdown {
initDeprecatedJQueryDropdown(this.groupDropdown, {
selectable: true,
filterable: true,
- toggleLabel: item => item.text,
+ toggleLabel: (item) => item.text,
search: { fields: ['text'] },
data: extraOptions.concat(this.data),
- text: item => item.text,
- clicked: options => {
+ text: (item) => item.text,
+ clicked: (options) => {
const { e } = options;
e.preventDefault();
this.assignSelected(options.selectedObj);