) const HR_PATTERN = /^((\s{0,3}-+\s*-+\s*-+\s*[\s-]*)|(\s{0,3}\*+\s*\*+\s*\*+\s*[\s*]*))$/; diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js index a538dc8307f..aa8b0731e83 100644 --- a/app/assets/javascripts/lib/utils/text_utility.js +++ b/app/assets/javascripts/lib/utils/text_utility.js @@ -140,10 +140,8 @@ const getAverageCharWidth = memoize(function getAverageCharWidth(options = {}) { * @return {String} either the original string or a truncated version */ export const truncateWidth = (string, options = {}) => { - const { - maxWidth = TRUNCATE_WIDTH_DEFAULT_WIDTH, - fontSize = TRUNCATE_WIDTH_DEFAULT_FONT_SIZE, - } = options; + const { maxWidth = TRUNCATE_WIDTH_DEFAULT_WIDTH, fontSize = TRUNCATE_WIDTH_DEFAULT_FONT_SIZE } = + options; const { truncateIndex } = string.split('').reduce( (memo, char, index) => { let newIndex = index; diff --git a/app/assets/javascripts/members/utils.js b/app/assets/javascripts/members/utils.js index 0fdb7bde373..e3f7c206a57 100644 --- a/app/assets/javascripts/members/utils.js +++ b/app/assets/javascripts/members/utils.js @@ -161,23 +161,21 @@ export const parseDataAttributes = (el) => { }); }; -export const baseRequestFormatter = (basePropertyName, accessLevelPropertyName) => ({ - accessLevel, - memberRoleId, - ...otherProperties -}) => { - const accessLevelProperty = !isUndefined(accessLevel) - ? { [accessLevelPropertyName]: accessLevel } - : {}; +export const baseRequestFormatter = + (basePropertyName, accessLevelPropertyName) => + ({ accessLevel, memberRoleId, ...otherProperties }) => { + const accessLevelProperty = !isUndefined(accessLevel) + ? { [accessLevelPropertyName]: accessLevel } + : {}; - return { - [basePropertyName]: { - ...accessLevelProperty, - member_role_id: memberRoleId ?? null, - ...otherProperties, - }, + return { + [basePropertyName]: { + ...accessLevelProperty, + member_role_id: memberRoleId ?? null, + ...otherProperties, + }, + }; }; -}; export const groupLinkRequestFormatter = baseRequestFormatter( GROUP_LINK_BASE_PROPERTY_NAME, diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index 8c96f8a017e..5882bf34c13 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -6,12 +6,8 @@ import { createStore } from './store'; export default function initMergeConflicts() { const conflictsEl = document.querySelector('#conflicts'); - const { - sourceBranchPath, - mergeRequestPath, - conflictsPath, - resolveConflictsPath, - } = conflictsEl.dataset; + const { sourceBranchPath, mergeRequestPath, conflictsPath, resolveConflictsPath } = + conflictsEl.dataset; initIssuableSidebar(); diff --git a/app/assets/javascripts/merge_conflicts/store/getters.js b/app/assets/javascripts/merge_conflicts/store/getters.js index 54f3d6ec4bc..89ba91e0249 100644 --- a/app/assets/javascripts/merge_conflicts/store/getters.js +++ b/app/assets/javascripts/merge_conflicts/store/getters.js @@ -112,6 +112,8 @@ export const fileTextTypePresent = (state) => { return state.conflictsData?.files.some((f) => f.type === CONFLICT_TYPES.TEXT); }; -export const getFileIndex = (state) => ({ blobPath }) => { - return state.conflictsData.files.findIndex((f) => f.blobPath === blobPath); -}; +export const getFileIndex = + (state) => + ({ blobPath }) => { + return state.conflictsData.files.findIndex((f) => f.blobPath === blobPath); + }; diff --git a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue index 22688bcda0d..8c4db908d4f 100644 --- a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue +++ b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue @@ -297,12 +297,8 @@ export default { return getSortOptions({ hasManualSort: false }); }, tabCounts() { - const { - openedMergeRequests, - closedMergeRequests, - mergedMergeRequests, - allMergeRequests, - } = this.mergeRequestCounts; + const { openedMergeRequests, closedMergeRequests, mergedMergeRequests, allMergeRequests } = + this.mergeRequestCounts; return { [STATUS_OPEN]: openedMergeRequests?.count, [STATUS_MERGED]: mergedMergeRequests?.count, diff --git a/app/assets/javascripts/namespaces/cascading_settings/components/lock_popovers.vue b/app/assets/javascripts/namespaces/cascading_settings/components/lock_popovers.vue index cde77d29937..a833f806ad9 100644 --- a/app/assets/javascripts/namespaces/cascading_settings/components/lock_popovers.vue +++ b/app/assets/javascripts/namespaces/cascading_settings/components/lock_popovers.vue @@ -31,11 +31,8 @@ export default { dataset: { popoverData }, } = el; - const { - lockedByAncestor, - lockedByApplicationSetting, - ancestorNamespace, - } = convertObjectPropsToCamelCase(JSON.parse(popoverData || '{}'), { deep: true }); + const { lockedByAncestor, lockedByApplicationSetting, ancestorNamespace } = + convertObjectPropsToCamelCase(JSON.parse(popoverData || '{}'), { deep: true }); return { el, diff --git a/app/assets/javascripts/notes/mixins/discussion_navigation.js b/app/assets/javascripts/notes/mixins/discussion_navigation.js index 212ca6851f6..83ad4cef1e6 100644 --- a/app/assets/javascripts/notes/mixins/discussion_navigation.js +++ b/app/assets/javascripts/notes/mixins/discussion_navigation.js @@ -38,9 +38,8 @@ function getNextDiscussion() { if (hasReachedPageEnd()) { return firstDiscussion; } - const [nextClosestDiscussion, index, isActive] = findNextClosestVisibleDiscussion( - discussionElements, - ); + const [nextClosestDiscussion, index, isActive] = + findNextClosestVisibleDiscussion(discussionElements); if (nextClosestDiscussion && !isActive) { return nextClosestDiscussion; } diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index 230dac51f3e..794356915c7 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -179,14 +179,16 @@ export const getDiscussionLastNote = (state) => (discussion) => export const unresolvedDiscussionsCount = (state) => state.unresolvedDiscussionsCount; export const resolvableDiscussionsCount = (state) => state.resolvableDiscussionsCount; -export const showJumpToNextDiscussion = (state, getters) => (mode = 'discussion') => { - const orderedDiffs = - mode !== 'discussion' - ? getters.unresolvedDiscussionsIdsByDiff - : getters.unresolvedDiscussionsIdsByDate; +export const showJumpToNextDiscussion = + (state, getters) => + (mode = 'discussion') => { + const orderedDiffs = + mode !== 'discussion' + ? getters.unresolvedDiscussionsIdsByDiff + : getters.unresolvedDiscussionsIdsByDate; - return orderedDiffs.length > 1; -}; + return orderedDiffs.length > 1; + }; export const isDiscussionResolved = (state, getters) => (discussionId) => getters.resolvedDiscussionsById[discussionId] !== undefined; @@ -302,26 +304,24 @@ export const isLastUnresolvedDiscussion = (state, getters) => (discussionId, dif return lastDiscussionId === discussionId; }; -export const findUnresolvedDiscussionIdNeighbor = (state, getters) => ({ - discussionId, - diffOrder, - step, -}) => { - const diffIds = getters.unresolvedDiscussionsIdsOrdered(diffOrder); - const dateIds = getters.unresolvedDiscussionsIdsOrdered(false); - const ids = diffIds.length ? diffIds : dateIds; - const index = ids.indexOf(discussionId) + step; +export const findUnresolvedDiscussionIdNeighbor = + (state, getters) => + ({ discussionId, diffOrder, step }) => { + const diffIds = getters.unresolvedDiscussionsIdsOrdered(diffOrder); + const dateIds = getters.unresolvedDiscussionsIdsOrdered(false); + const ids = diffIds.length ? diffIds : dateIds; + const index = ids.indexOf(discussionId) + step; - if (index < 0 && step < 0) { - return ids[ids.length - 1]; - } + if (index < 0 && step < 0) { + return ids[ids.length - 1]; + } - if (index === ids.length && step > 0) { - return ids[0]; - } + if (index === ids.length && step > 0) { + return ids[0]; + } - return ids[index]; -}; + return ids[index]; + }; // Gets the ID of the discussion following the one provided, respecting order (diff or date) // @param {Boolean} discussionId - id of the current discussion diff --git a/app/assets/javascripts/organizations/activity/index.js b/app/assets/javascripts/organizations/activity/index.js index 3b52845c46e..f3dbeb32ef1 100644 --- a/app/assets/javascripts/organizations/activity/index.js +++ b/app/assets/javascripts/organizations/activity/index.js @@ -8,11 +8,8 @@ export const initOrganizationsActivity = () => { const { dataset: { appData }, } = el; - const { - organizationActivityPath, - organizationActivityEventTypes, - organizationActivityAllEvent, - } = convertObjectPropsToCamelCase(JSON.parse(appData)); + const { organizationActivityPath, organizationActivityEventTypes, organizationActivityAllEvent } = + convertObjectPropsToCamelCase(JSON.parse(appData)); return new Vue({ el, diff --git a/app/assets/javascripts/organizations/groups_and_projects/index.js b/app/assets/javascripts/organizations/groups_and_projects/index.js index eb28428588c..8040bd4e0a2 100644 --- a/app/assets/javascripts/organizations/groups_and_projects/index.js +++ b/app/assets/javascripts/organizations/groups_and_projects/index.js @@ -32,6 +32,7 @@ export const initOrganizationsGroupsAndProjects = () => { projectsEmptyStateSvgPath, groupsEmptyStateSvgPath, newGroupPath, + groupsPath, newProjectPath, canCreateGroup, canCreateProject, @@ -56,6 +57,7 @@ export const initOrganizationsGroupsAndProjects = () => { projectsEmptyStateSvgPath, groupsEmptyStateSvgPath, newGroupPath, + groupsPath, newProjectPath, canCreateGroup, canCreateProject, diff --git a/app/assets/javascripts/organizations/projects/edit/index.js b/app/assets/javascripts/organizations/projects/edit/index.js index 1162af9bc67..2b07ddde5bb 100644 --- a/app/assets/javascripts/organizations/projects/edit/index.js +++ b/app/assets/javascripts/organizations/projects/edit/index.js @@ -11,11 +11,10 @@ export const initOrganizationsProjectsEdit = () => { const { dataset: { appData }, } = el; - const { - projectsOrganizationPath, - previewMarkdownPath, - project, - } = convertObjectPropsToCamelCase(JSON.parse(appData), { deep: true }); + const { projectsOrganizationPath, previewMarkdownPath, project } = convertObjectPropsToCamelCase( + JSON.parse(appData), + { deep: true }, + ); return new Vue({ el, diff --git a/app/assets/javascripts/organizations/settings/general/index.js b/app/assets/javascripts/organizations/settings/general/index.js index 3ac1243ff0f..8fc086b5309 100644 --- a/app/assets/javascripts/organizations/settings/general/index.js +++ b/app/assets/javascripts/organizations/settings/general/index.js @@ -13,12 +13,8 @@ export const initOrganizationsSettingsGeneral = () => { const { dataset: { appData }, } = el; - const { - organization, - organizationsPath, - rootUrl, - previewMarkdownPath, - } = convertObjectPropsToCamelCase(JSON.parse(appData)); + const { organization, organizationsPath, rootUrl, previewMarkdownPath } = + convertObjectPropsToCamelCase(JSON.parse(appData)); const apolloProvider = new VueApollo({ defaultClient: createDefaultClient(), diff --git a/app/assets/javascripts/organizations/shared/components/groups_view.vue b/app/assets/javascripts/organizations/shared/components/groups_view.vue index 80a16277490..cc32ce2be34 100644 --- a/app/assets/javascripts/organizations/shared/components/groups_view.vue +++ b/app/assets/javascripts/organizations/shared/components/groups_view.vue @@ -5,7 +5,7 @@ import { s__, __ } from '~/locale'; import GroupsList from '~/vue_shared/components/groups_list/groups_list.vue'; import { ACTION_DELETE } from '~/vue_shared/components/list_actions/constants'; import { DEFAULT_PER_PAGE } from '~/api'; -import { deleteGroup } from 'ee_else_ce/rest_api'; +import axios from '~/lib/utils/axios_utils'; import { renderDeleteSuccessToast, deleteParams, @@ -43,6 +43,7 @@ export default { inject: { organizationGid: {}, groupsEmptyStateSvgPath: {}, + groupsPath: {}, }, props: { shouldShowEmptyStateButtons: { @@ -172,7 +173,9 @@ export default { try { this.setGroupIsDeleting(nodeIndex, true); - await deleteGroup(group.id, deleteParams(group)); + await axios.delete(this.groupsPath, { + params: { id: group.fullPath, ...deleteParams(group) }, + }); this.$apollo.queries.groups.refetch(); renderDeleteSuccessToast(group, this.$options.i18n.group); } catch (error) { diff --git a/app/assets/javascripts/organizations/show/index.js b/app/assets/javascripts/organizations/show/index.js index 214515ee055..66bf5382ed7 100644 --- a/app/assets/javascripts/organizations/show/index.js +++ b/app/assets/javascripts/organizations/show/index.js @@ -34,6 +34,7 @@ export const initOrganizationsShow = () => { projectsEmptyStateSvgPath, groupsEmptyStateSvgPath, newGroupPath, + groupsPath, newProjectPath, associationCounts, canCreateProject, @@ -57,6 +58,7 @@ export const initOrganizationsShow = () => { projectsEmptyStateSvgPath, groupsEmptyStateSvgPath, newGroupPath, + groupsPath, newProjectPath, canCreateProject, canCreateGroup, diff --git a/app/assets/javascripts/packages_and_registries/dependency_proxy/index.js b/app/assets/javascripts/packages_and_registries/dependency_proxy/index.js index c115898c75b..8b7192f1b5e 100644 --- a/app/assets/javascripts/packages_and_registries/dependency_proxy/index.js +++ b/app/assets/javascripts/packages_and_registries/dependency_proxy/index.js @@ -11,14 +11,8 @@ export const initDependencyProxyApp = () => { if (!el) { return null; } - const { - endpoint, - groupPath, - groupId, - noManifestsIllustration, - canClearCache, - settingsPath, - } = el.dataset; + const { endpoint, groupPath, groupId, noManifestsIllustration, canClearCache, settingsPath } = + el.dataset; return new Vue({ el, apolloProvider, diff --git a/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js b/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js index c7b0899fa4c..0b59b2e1201 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js +++ b/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js @@ -1,33 +1,35 @@ import { produce } from 'immer'; import getGroupPackagesSettingsQuery from '../queries/get_group_packages_settings.query.graphql'; -export const updateGroupPackageSettings = (fullPath) => (client, { data: updatedData }) => { - const queryAndParams = { - query: getGroupPackagesSettingsQuery, - variables: { fullPath }, +export const updateGroupPackageSettings = + (fullPath) => + (client, { data: updatedData }) => { + const queryAndParams = { + query: getGroupPackagesSettingsQuery, + variables: { fullPath }, + }; + const sourceData = client.readQuery(queryAndParams); + + const data = produce(sourceData, (draftState) => { + if (updatedData.updateNamespacePackageSettings) { + draftState.group.packageSettings = { + ...updatedData.updateNamespacePackageSettings.packageSettings, + }; + } + if (updatedData.updateDependencyProxySettings) { + draftState.group.dependencyProxySetting = { + ...updatedData.updateDependencyProxySettings.dependencyProxySetting, + }; + } + if (updatedData.updateDependencyProxyImageTtlGroupPolicy) { + draftState.group.dependencyProxyImageTtlPolicy = { + ...updatedData.updateDependencyProxyImageTtlGroupPolicy.dependencyProxyImageTtlPolicy, + }; + } + }); + + client.writeQuery({ + ...queryAndParams, + data, + }); }; - const sourceData = client.readQuery(queryAndParams); - - const data = produce(sourceData, (draftState) => { - if (updatedData.updateNamespacePackageSettings) { - draftState.group.packageSettings = { - ...updatedData.updateNamespacePackageSettings.packageSettings, - }; - } - if (updatedData.updateDependencyProxySettings) { - draftState.group.dependencyProxySetting = { - ...updatedData.updateDependencyProxySettings.dependencyProxySetting, - }; - } - if (updatedData.updateDependencyProxyImageTtlGroupPolicy) { - draftState.group.dependencyProxyImageTtlPolicy = { - ...updatedData.updateDependencyProxyImageTtlGroupPolicy.dependencyProxyImageTtlPolicy, - }; - } - }); - - client.writeQuery({ - ...queryAndParams, - data, - }); -}; diff --git a/app/assets/javascripts/packages_and_registries/settings/project/graphql/utils/cache_update.js b/app/assets/javascripts/packages_and_registries/settings/project/graphql/utils/cache_update.js index 5e0be3834cb..4ec41c5fa53 100644 --- a/app/assets/javascripts/packages_and_registries/settings/project/graphql/utils/cache_update.js +++ b/app/assets/javascripts/packages_and_registries/settings/project/graphql/utils/cache_update.js @@ -1,22 +1,24 @@ import { produce } from 'immer'; import expirationPolicyQuery from '../queries/get_expiration_policy.query.graphql'; -export const updateContainerExpirationPolicy = (projectPath) => (client, { data: updatedData }) => { - const queryAndParams = { - query: expirationPolicyQuery, - variables: { projectPath }, - }; - const sourceData = client.readQuery(queryAndParams); - - const data = produce(sourceData, (draftState) => { - draftState.project.containerExpirationPolicy = { - ...draftState.project.containerExpirationPolicy, - ...updatedData.updateContainerExpirationPolicy.containerExpirationPolicy, +export const updateContainerExpirationPolicy = + (projectPath) => + (client, { data: updatedData }) => { + const queryAndParams = { + query: expirationPolicyQuery, + variables: { projectPath }, }; - }); + const sourceData = client.readQuery(queryAndParams); - client.writeQuery({ - ...queryAndParams, - data, - }); -}; + const data = produce(sourceData, (draftState) => { + draftState.project.containerExpirationPolicy = { + ...draftState.project.containerExpirationPolicy, + ...updatedData.updateContainerExpirationPolicy.containerExpirationPolicy, + }; + }); + + client.writeQuery({ + ...queryAndParams, + data, + }); + }; diff --git a/app/assets/javascripts/pages/projects/branches/index/index.js b/app/assets/javascripts/pages/projects/branches/index/index.js index b031dfd9871..216632fbb1d 100644 --- a/app/assets/javascripts/pages/projects/branches/index/index.js +++ b/app/assets/javascripts/pages/projects/branches/index/index.js @@ -6,9 +6,8 @@ import initDeleteMergedBranches from '~/branches/init_delete_merged_branches'; import initBranchMoreActions from '~/branches/init_branch_more_actions'; import initSourceCodeDropdowns from '~/vue_shared/components/download_dropdown/init_download_dropdowns'; -const { divergingCountsEndpoint, defaultBranch } = document.querySelector( - '.js-branch-list', -).dataset; +const { divergingCountsEndpoint, defaultBranch } = + document.querySelector('.js-branch-list').dataset; initDiverganceGraph(divergingCountsEndpoint, defaultBranch); BranchSortDropdown(); diff --git a/app/assets/javascripts/pages/projects/graphs/charts/index.js b/app/assets/javascripts/pages/projects/graphs/charts/index.js index 8f9593f48a5..6c09638905c 100644 --- a/app/assets/javascripts/pages/projects/graphs/charts/index.js +++ b/app/assets/javascripts/pages/projects/graphs/charts/index.js @@ -64,13 +64,8 @@ new Vue({ }); if (codeCoverageContainer?.dataset) { - const { - graphEndpoint, - graphEndDate, - graphStartDate, - graphRef, - graphCsvPath, - } = codeCoverageContainer.dataset; + const { graphEndpoint, graphEndDate, graphStartDate, graphRef, graphCsvPath } = + codeCoverageContainer.dataset; // eslint-disable-next-line no-new new Vue({ el: codeCoverageContainer, diff --git a/app/assets/javascripts/performance_bar/services/performance_bar_service.js b/app/assets/javascripts/performance_bar/services/performance_bar_service.js index 3a9788d8ab6..025ffa52eec 100644 --- a/app/assets/javascripts/performance_bar/services/performance_bar_service.js +++ b/app/assets/javascripts/performance_bar/services/performance_bar_service.js @@ -10,14 +10,8 @@ export default class PerformanceBarService { static registerInterceptor(peekUrl, callback) { PerformanceBarService.interceptor = (response) => { - const [ - fireCallback, - requestId, - requestUrl, - requestParams, - operationName, - methodVerb, - ] = PerformanceBarService.callbackParams(response, peekUrl); + const [fireCallback, requestId, requestUrl, requestParams, operationName, methodVerb] = + PerformanceBarService.callbackParams(response, peekUrl); if (fireCallback) { callback(requestId, requestUrl, operationName, requestParams, methodVerb); diff --git a/app/assets/javascripts/projects/explore/index.js b/app/assets/javascripts/projects/explore/index.js index d7b5b83f675..53f12bbb9c1 100644 --- a/app/assets/javascripts/projects/explore/index.js +++ b/app/assets/javascripts/projects/explore/index.js @@ -11,12 +11,8 @@ export const initProjectsExploreFilteredSearchAndSort = () => { dataset: { appData }, } = el; - const { - initialSort, - programmingLanguages, - starredExploreProjectsPath, - exploreRootPath, - } = convertObjectPropsToCamelCase(JSON.parse(appData)); + const { initialSort, programmingLanguages, starredExploreProjectsPath, exploreRootPath } = + convertObjectPropsToCamelCase(JSON.parse(appData)); return new Vue({ el, diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/mount_branch_rules.js b/app/assets/javascripts/projects/settings/repository/branch_rules/mount_branch_rules.js index a8736c87e22..b6882a4d368 100644 --- a/app/assets/javascripts/projects/settings/repository/branch_rules/mount_branch_rules.js +++ b/app/assets/javascripts/projects/settings/repository/branch_rules/mount_branch_rules.js @@ -13,13 +13,8 @@ const apolloProvider = new VueApollo({ export default function mountBranchRules(el) { if (!el) return null; - const { - projectPath, - branchRulesPath, - showCodeOwners, - showStatusChecks, - showApprovers, - } = el.dataset; + const { projectPath, branchRulesPath, showCodeOwners, showStatusChecks, showApprovers } = + el.dataset; return new Vue({ el, diff --git a/app/assets/javascripts/projects/upload_file.js b/app/assets/javascripts/projects/upload_file.js index 597965eabfc..a1b19abee6b 100644 --- a/app/assets/javascripts/projects/upload_file.js +++ b/app/assets/javascripts/projects/upload_file.js @@ -8,13 +8,8 @@ export const initUploadFileTrigger = () => { if (!uploadFileTriggerEl) return false; - const { - targetBranch, - originalBranch, - canPushCode, - path, - projectPath, - } = uploadFileTriggerEl.dataset; + const { targetBranch, originalBranch, canPushCode, path, projectPath } = + uploadFileTriggerEl.dataset; return new Vue({ el: uploadFileTriggerEl, diff --git a/app/assets/javascripts/prometheus_metrics/custom_metrics.js b/app/assets/javascripts/prometheus_metrics/custom_metrics.js index e10b5bf1807..a5bc912dcc3 100644 --- a/app/assets/javascripts/prometheus_metrics/custom_metrics.js +++ b/app/assets/javascripts/prometheus_metrics/custom_metrics.js @@ -27,9 +27,8 @@ export default class CustomMetrics extends PrometheusMetrics { this.$monitoredCustomMetricsEmpty = this.$monitoredCustomMetricsPanel.find( '.js-empty-custom-metrics', ); - this.$monitoredCustomMetricsList = this.$monitoredCustomMetricsPanel.find( - '.js-custom-metrics-list', - ); + this.$monitoredCustomMetricsList = + this.$monitoredCustomMetricsPanel.find('.js-custom-metrics-list'); this.$monitoredCustomMetricsNoIntegrationText = this.$monitoredCustomMetricsPanel.find( '.js-no-active-integration-text', ); @@ -46,9 +45,8 @@ export default class CustomMetrics extends PrometheusMetrics { this.$monitoredCustomMetricsEmpty, ]; - this.activeCustomMetricsEndpoint = this.$monitoredCustomMetricsPanel.data( - 'active-custom-metrics', - ); + this.activeCustomMetricsEndpoint = + this.$monitoredCustomMetricsPanel.data('active-custom-metrics'); this.environmentsDataEndpoint = this.$monitoredCustomMetricsPanel.data( 'environments-data-endpoint', ); diff --git a/app/assets/javascripts/related_issues/components/issue_token.vue b/app/assets/javascripts/related_issues/components/issue_token.vue index fa338440b01..d141ddb1d7a 100644 --- a/app/assets/javascripts/related_issues/components/issue_token.vue +++ b/app/assets/javascripts/related_issues/components/issue_token.vue @@ -48,7 +48,8 @@ export default {
@@ -69,7 +70,8 @@ export default {
v-if="hasTitle"
ref="title"
:class="{
- 'issue-token-title issue-token-end gl-overflow-hidden gl-display-flex gl-align-items-baseline gl-text-gray-500 gl-pl-3': isCondensed,
+ 'issue-token-title issue-token-end gl-overflow-hidden gl-display-flex gl-align-items-baseline gl-text-gray-500 gl-pl-3':
+ isCondensed,
'issue-title block-truncated': !isCondensed,
'gl-rounded-top-right-small gl-rounded-bottom-right-small gl-pr-3': !canRemove,
}"
@@ -81,7 +83,8 @@ export default {
:is="innerComponentType"
ref="reference"
:class="{
- 'issue-token-reference gl-display-flex gl-align-items-center gl-rounded-top-left-small gl-rounded-bottom-left-small gl-px-3': isCondensed,
+ 'issue-token-reference gl-display-flex gl-align-items-center gl-rounded-top-left-small gl-rounded-bottom-left-small gl-px-3':
+ isCondensed,
'issuable-info': !isCondensed,
}"
>
@@ -103,7 +106,8 @@ export default {
ref="removeButton"
v-gl-tooltip
:class="{
- 'issue-token-remove-button gl-display-flex gl-align-items-center gl-px-3 gl-border-0 gl-rounded-top-right-small gl-rounded-bottom-right-small gl-text-gray-500': isCondensed,
+ 'issue-token-remove-button gl-display-flex gl-align-items-center gl-px-3 gl-border-0 gl-rounded-top-right-small gl-rounded-bottom-right-small gl-text-gray-500':
+ isCondensed,
'btn btn-default': !isCondensed,
}"
:title="removeButtonLabel"
diff --git a/app/assets/javascripts/releases/stores/modules/edit_new/actions.js b/app/assets/javascripts/releases/stores/modules/edit_new/actions.js
index 41af5a6ecd0..da663055ebf 100644
--- a/app/assets/javascripts/releases/stores/modules/edit_new/actions.js
+++ b/app/assets/javascripts/releases/stores/modules/edit_new/actions.js
@@ -18,14 +18,16 @@ import * as types from './mutation_types';
class GraphQLError extends Error {}
-const updateDraft = (action) => (store, ...args) => {
- action(store, ...args);
+const updateDraft =
+ (action) =>
+ (store, ...args) => {
+ action(store, ...args);
- if (!store.state.isExistingRelease) {
- store.dispatch('saveDraftRelease');
- store.dispatch('saveDraftCreateFrom');
- }
-};
+ if (!store.state.isExistingRelease) {
+ store.dispatch('saveDraftRelease');
+ store.dispatch('saveDraftCreateFrom');
+ }
+ };
export const initializeRelease = ({ dispatch, state }) => {
if (state.isExistingRelease) {
diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index 0b379988325..00c52f6a760 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -175,13 +175,8 @@ export default function setupVueRepositoryList() {
if (!codeDropdownEl) return false;
- const {
- sshUrl,
- httpUrl,
- kerberosUrl,
- xcodeUrl,
- directoryDownloadLinks,
- } = codeDropdownEl.dataset;
+ const { sshUrl, httpUrl, kerberosUrl, xcodeUrl, directoryDownloadLinks } =
+ codeDropdownEl.dataset;
return new Vue({
el: codeDropdownEl,
diff --git a/app/assets/javascripts/search/index.js b/app/assets/javascripts/search/index.js
index 5414e712912..34519ad0978 100644
--- a/app/assets/javascripts/search/index.js
+++ b/app/assets/javascripts/search/index.js
@@ -11,13 +11,8 @@ const sidebarInitState = () => {
const el = document.getElementById('js-search-sidebar');
if (!el) return {};
- const {
- navigationJson,
- searchType,
- searchLevel,
- groupInitialJson,
- projectInitialJson,
- } = el.dataset;
+ const { navigationJson, searchType, searchLevel, groupInitialJson, projectInitialJson } =
+ el.dataset;
const navigationJsonParsed = JSON.parse(navigationJson);
const groupInitialJsonParsed = JSON.parse(groupInitialJson);
diff --git a/app/assets/javascripts/security_configuration/graphql/cache_utils.js b/app/assets/javascripts/security_configuration/graphql/cache_utils.js
index 6d5258b01dc..d65a1fce30f 100644
--- a/app/assets/javascripts/security_configuration/graphql/cache_utils.js
+++ b/app/assets/javascripts/security_configuration/graphql/cache_utils.js
@@ -14,27 +14,29 @@ export const updateSecurityTrainingOptimisticResponse = (changes) => ({
},
});
-export const updateSecurityTrainingCache = ({ query, variables }) => (cache, { data }) => {
- const {
- securityTrainingUpdate: { training: updatedProvider },
- } = data;
- const { project } = cache.readQuery({ query, variables });
- if (!updatedProvider.isPrimary) {
- return;
- }
+export const updateSecurityTrainingCache =
+ ({ query, variables }) =>
+ (cache, { data }) => {
+ const {
+ securityTrainingUpdate: { training: updatedProvider },
+ } = data;
+ const { project } = cache.readQuery({ query, variables });
+ if (!updatedProvider.isPrimary) {
+ return;
+ }
- // when we set a new primary provider, we need to unset the previous one(s)
- const updatedProject = produce(project, (draft) => {
- draft.securityTrainingProviders.forEach((provider) => {
- // eslint-disable-next-line no-param-reassign
- provider.isPrimary = provider.id === updatedProvider.id;
+ // when we set a new primary provider, we need to unset the previous one(s)
+ const updatedProject = produce(project, (draft) => {
+ draft.securityTrainingProviders.forEach((provider) => {
+ // eslint-disable-next-line no-param-reassign
+ provider.isPrimary = provider.id === updatedProvider.id;
+ });
});
- });
- // write to the cache
- cache.writeQuery({
- query,
- variables,
- data: { project: updatedProject },
- });
-};
+ // write to the cache
+ cache.writeQuery({
+ query,
+ variables,
+ data: { project: updatedProject },
+ });
+ };
diff --git a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
index cb6d503d6ef..6060a0edde2 100644
--- a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
+++ b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
@@ -8,14 +8,8 @@ export default class SidebarMilestone {
if (!el) return;
- const {
- timeEstimate,
- timeSpent,
- humanTimeEstimate,
- humanTimeSpent,
- limitToHours,
- iid,
- } = el.dataset;
+ const { timeEstimate, timeSpent, humanTimeEstimate, humanTimeSpent, limitToHours, iid } =
+ el.dataset;
// eslint-disable-next-line no-new
new Vue({
diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js
index d89a95d115d..7a6d890ba9e 100644
--- a/app/assets/javascripts/sidebar/mount_sidebar.js
+++ b/app/assets/javascripts/sidebar/mount_sidebar.js
@@ -547,15 +547,8 @@ function mountSidebarSubscriptionsWidget() {
function mountSidebarTimeTracking() {
const el = document.querySelector('.js-sidebar-time-tracking-root');
- const {
- id,
- iid,
- fullPath,
- issuableType,
- timeTrackingLimitToHours,
- canCreateTimelogs,
- editable,
- } = getSidebarOptions();
+ const { id, iid, fullPath, issuableType, timeTrackingLimitToHours, canCreateTimelogs, editable } =
+ getSidebarOptions();
if (!el) {
return null;
diff --git a/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js b/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
index 5069bbac95d..9c6770aa2b2 100644
--- a/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
+++ b/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
@@ -54,13 +54,8 @@ const getTrialStatusWidgetData = (sidebarData) => {
sidebarData.duo_pro_trial_status_widget_data_attrs &&
sidebarData.duo_pro_trial_status_popover_data_attrs
) {
- const {
- containerId,
- trialDaysUsed,
- trialDuration,
- percentageComplete,
- widgetUrl,
- } = convertObjectPropsToCamelCase(sidebarData.duo_pro_trial_status_widget_data_attrs);
+ const { containerId, trialDaysUsed, trialDuration, percentageComplete, widgetUrl } =
+ convertObjectPropsToCamelCase(sidebarData.duo_pro_trial_status_widget_data_attrs);
const { daysRemaining, trialEndDate, purchaseNowUrl } = convertObjectPropsToCamelCase(
sidebarData.duo_pro_trial_status_popover_data_attrs,
@@ -108,14 +103,8 @@ export const initSuperSidebar = () => {
const commandPaletteLinks = convertObjectPropsToCamelCase(sidebarData.current_menu_items || []);
const contextSwitcherLinks = sidebarData.context_switcher_links;
- const {
- searchPath,
- issuesPath,
- mrPath,
- autocompletePath,
- settingsPath,
- searchContext,
- } = searchData;
+ const { searchPath, issuesPath, mrPath, autocompletePath, settingsPath, searchContext } =
+ searchData;
const isImpersonating = parseBoolean(sidebarData.is_impersonating);
const isGroup = Boolean(sidebarData.current_context?.namespace === CONTEXT_NAMESPACE_GROUPS);
diff --git a/app/assets/javascripts/users/profile/actions/index.js b/app/assets/javascripts/users/profile/actions/index.js
index e1f9352966b..ff98294f1a0 100644
--- a/app/assets/javascripts/users/profile/actions/index.js
+++ b/app/assets/javascripts/users/profile/actions/index.js
@@ -7,13 +7,8 @@ export const initUserActionsApp = () => {
if (!mountingEl) return false;
- const {
- userId,
- rssSubscriptionPath,
- reportAbusePath,
- reportedUserId,
- reportedFromUrl,
- } = mountingEl.dataset;
+ const { userId, rssSubscriptionPath, reportAbusePath, reportedUserId, reportedFromUrl } =
+ mountingEl.dataset;
Vue.use(GlToast);
diff --git a/app/assets/javascripts/validators/length_validator.js b/app/assets/javascripts/validators/length_validator.js
index 6ce453fe40b..73761d68a92 100644
--- a/app/assets/javascripts/validators/length_validator.js
+++ b/app/assets/javascripts/validators/length_validator.js
@@ -31,13 +31,8 @@ export default class LengthValidator extends InputValidator {
);
const { value } = this.inputDomElement;
- const {
- minLength,
- minLengthMessage,
- maxLengthMessage,
- maxLength,
- allowEmpty,
- } = this.inputDomElement.dataset;
+ const { minLength, minLengthMessage, maxLengthMessage, maxLength, allowEmpty } =
+ this.inputDomElement.dataset;
this.invalidInput = false;
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
index bf60a50e971..2e5097ef25b 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/state_container.vue
@@ -105,7 +105,8 @@ export default {
({
id: issue.id, // Required: The ID of the object
header: ['New', 'This is an %{strong_start}issue%{strong_end} row'],
- text:
- '%{critical_start}1 Critical%{critical_end}, %{danger_start}1 High%{danger_end}, and %{strong_start}1 Other%{strong_end}. %{small_start}Some smaller text%{small_end}', // Required: The text to get used on each row
+ text: '%{critical_start}1 Critical%{critical_end}, %{danger_start}1 High%{danger_end}, and %{strong_start}1 Other%{strong_end}. %{small_start}Some smaller text%{small_end}', // Required: The text to get used on each row
subtext:
'Reported resource changes: %{strong_start}2%{strong_end} to add, 0 to change, 0 to delete', // Optional: The sub-text to get displayed below each rows main content
// Icon to get rendered on the side of each row
diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue b/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue
index 1ec770636f2..2302b2bd176 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/test_report/index.vue
@@ -61,9 +61,8 @@ export default {
return uniq(fileNames).join(' ').trim();
},
summary() {
- const {
- data: { parsingInProgress = false, hasSuiteError = false, summary = {} } = {},
- } = this.collapsedData;
+ const { data: { parsingInProgress = false, hasSuiteError = false, summary = {} } = {} } =
+ this.collapsedData;
if (parsingInProgress) {
return { title: this.$options.i18n.loading };
diff --git a/app/assets/javascripts/vue_shared/alert_details/index.js b/app/assets/javascripts/vue_shared/alert_details/index.js
index 357dfa49901..3d0f43e8503 100644
--- a/app/assets/javascripts/vue_shared/alert_details/index.js
+++ b/app/assets/javascripts/vue_shared/alert_details/index.js
@@ -73,9 +73,8 @@ export default (selector) => {
const opsProperties = {};
- const { TRACK_ALERTS_DETAILS_VIEWS_OPTIONS, TRACK_ALERT_STATUS_UPDATE_OPTIONS } = PAGE_CONFIG[
- page
- ];
+ const { TRACK_ALERTS_DETAILS_VIEWS_OPTIONS, TRACK_ALERT_STATUS_UPDATE_OPTIONS } =
+ PAGE_CONFIG[page];
provide.trackAlertsDetailsViewsOptions = TRACK_ALERTS_DETAILS_VIEWS_OPTIONS;
provide.trackAlertStatusUpdateOptions = TRACK_ALERT_STATUS_UPDATE_OPTIONS;
opsProperties.store = createStore({}, service);
diff --git a/app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.stories.js b/app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.stories.js
index 03bd64e2a57..ccb1ebf5eeb 100644
--- a/app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.stories.js
+++ b/app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.stories.js
@@ -21,25 +21,27 @@ export default {
},
};
-const createStory = ({ ...options }) => (_, { argTypes }) => ({
- components: { MarkdownDrawer, GlButton },
- props: Object.keys(argTypes),
- data() {
- return {
- render: false,
- };
- },
- methods: {
- toggleDrawer() {
- this.$refs.drawer.toggleDrawer();
+const createStory =
+ ({ ...options }) =>
+ (_, { argTypes }) => ({
+ components: { MarkdownDrawer, GlButton },
+ props: Object.keys(argTypes),
+ data() {
+ return {
+ render: false,
+ };
},
- },
- mounted() {
- window.requestAnimationFrame(() => {
- this.render = true;
- });
- },
- template: `
+ methods: {
+ toggleDrawer() {
+ this.$refs.drawer.toggleDrawer();
+ },
+ },
+ mounted() {
+ window.requestAnimationFrame(() => {
+ this.render = true;
+ });
+ },
+ template: `
Open Drawer
(_, { argTypes }) => ({
/>
`,
- ...options,
-});
+ ...options,
+ });
export const Default = createStory({});
diff --git a/app/assets/javascripts/vue_shared/components/metric_images/store/actions.js b/app/assets/javascripts/vue_shared/components/metric_images/store/actions.js
index 6f91463365b..494fc9e43bb 100644
--- a/app/assets/javascripts/vue_shared/components/metric_images/store/actions.js
+++ b/app/assets/javascripts/vue_shared/components/metric_images/store/actions.js
@@ -2,75 +2,77 @@ import { createAlert } from '~/alert';
import { s__ } from '~/locale';
import * as types from './mutation_types';
-export const fetchImagesFactory = (service) => async ({ state, commit }) => {
- commit(types.REQUEST_METRIC_IMAGES);
- const { modelIid, projectId } = state;
+export const fetchImagesFactory =
+ (service) =>
+ async ({ state, commit }) => {
+ commit(types.REQUEST_METRIC_IMAGES);
+ const { modelIid, projectId } = state;
- try {
- const response = await service.getMetricImages({ id: projectId, modelIid });
- commit(types.RECEIVE_METRIC_IMAGES_SUCCESS, response);
- } catch (error) {
- commit(types.RECEIVE_METRIC_IMAGES_ERROR);
- createAlert({ message: s__('MetricImages|There was an issue loading metric images.') });
- }
-};
+ try {
+ const response = await service.getMetricImages({ id: projectId, modelIid });
+ commit(types.RECEIVE_METRIC_IMAGES_SUCCESS, response);
+ } catch (error) {
+ commit(types.RECEIVE_METRIC_IMAGES_ERROR);
+ createAlert({ message: s__('MetricImages|There was an issue loading metric images.') });
+ }
+ };
-export const uploadImageFactory = (service) => async (
- { state, commit },
- { files, url, urlText },
-) => {
- commit(types.REQUEST_METRIC_UPLOAD);
+export const uploadImageFactory =
+ (service) =>
+ async ({ state, commit }, { files, url, urlText }) => {
+ commit(types.REQUEST_METRIC_UPLOAD);
- const { modelIid, projectId } = state;
+ const { modelIid, projectId } = state;
- try {
- const response = await service.uploadMetricImage({
- file: files.item(0),
- id: projectId,
- modelIid,
- url,
- urlText,
- });
- commit(types.RECEIVE_METRIC_UPLOAD_SUCCESS, response);
- } catch (error) {
- commit(types.RECEIVE_METRIC_UPLOAD_ERROR);
- createAlert({ message: s__('MetricImages|There was an issue uploading your image.') });
- }
-};
+ try {
+ const response = await service.uploadMetricImage({
+ file: files.item(0),
+ id: projectId,
+ modelIid,
+ url,
+ urlText,
+ });
+ commit(types.RECEIVE_METRIC_UPLOAD_SUCCESS, response);
+ } catch (error) {
+ commit(types.RECEIVE_METRIC_UPLOAD_ERROR);
+ createAlert({ message: s__('MetricImages|There was an issue uploading your image.') });
+ }
+ };
-export const updateImageFactory = (service) => async (
- { state, commit },
- { imageId, url, urlText },
-) => {
- commit(types.REQUEST_METRIC_UPLOAD);
+export const updateImageFactory =
+ (service) =>
+ async ({ state, commit }, { imageId, url, urlText }) => {
+ commit(types.REQUEST_METRIC_UPLOAD);
- const { modelIid, projectId } = state;
+ const { modelIid, projectId } = state;
- try {
- const response = await service.updateMetricImage({
- modelIid,
- id: projectId,
- imageId,
- url,
- urlText,
- });
- commit(types.RECEIVE_METRIC_UPDATE_SUCCESS, response);
- } catch (error) {
- commit(types.RECEIVE_METRIC_UPLOAD_ERROR);
- createAlert({ message: s__('MetricImages|There was an issue updating your image.') });
- }
-};
+ try {
+ const response = await service.updateMetricImage({
+ modelIid,
+ id: projectId,
+ imageId,
+ url,
+ urlText,
+ });
+ commit(types.RECEIVE_METRIC_UPDATE_SUCCESS, response);
+ } catch (error) {
+ commit(types.RECEIVE_METRIC_UPLOAD_ERROR);
+ createAlert({ message: s__('MetricImages|There was an issue updating your image.') });
+ }
+ };
-export const deleteImageFactory = (service) => async ({ state, commit }, imageId) => {
- const { modelIid, projectId } = state;
+export const deleteImageFactory =
+ (service) =>
+ async ({ state, commit }, imageId) => {
+ const { modelIid, projectId } = state;
- try {
- await service.deleteMetricImage({ imageId, id: projectId, modelIid });
- commit(types.RECEIVE_METRIC_DELETE_SUCCESS, imageId);
- } catch (error) {
- createAlert({ message: s__('MetricImages|There was an issue deleting the image.') });
- }
-};
+ try {
+ await service.deleteMetricImage({ imageId, id: projectId, modelIid });
+ commit(types.RECEIVE_METRIC_DELETE_SUCCESS, imageId);
+ } catch (error) {
+ createAlert({ message: s__('MetricImages|There was an issue deleting the image.') });
+ }
+ };
export const setInitialData = ({ commit }, data) => {
commit(types.SET_INITIAL_DATA, data);
diff --git a/app/assets/javascripts/vue_shared/directives/validation.js b/app/assets/javascripts/vue_shared/directives/validation.js
index b9a09c2521c..c129aff9236 100644
--- a/app/assets/javascripts/vue_shared/directives/validation.js
+++ b/app/assets/javascripts/vue_shared/directives/validation.js
@@ -46,32 +46,34 @@ const getInputElement = (el) => {
const isEveryFieldValid = (form) => Object.values(form.fields).every(({ state }) => state === true);
-const createValidator = (feedbackMap) => ({ el, form, reportInvalidInput = false }) => {
- const { name } = el;
+const createValidator =
+ (feedbackMap) =>
+ ({ el, form, reportInvalidInput = false }) => {
+ const { name } = el;
- if (!name) {
- if (process.env.NODE_ENV === 'development') {
- // eslint-disable-next-line no-console
- console.warn(
- '[gitlab] the validation directive requires the given input to have "name" attribute',
- );
+ if (!name) {
+ if (process.env.NODE_ENV === 'development') {
+ // eslint-disable-next-line no-console
+ console.warn(
+ '[gitlab] the validation directive requires the given input to have "name" attribute',
+ );
+ }
+ return;
}
- return;
- }
- const formField = form.fields[name];
- const isValid = el.checkValidity();
+ const formField = form.fields[name];
+ const isValid = el.checkValidity();
- // This makes sure we always report valid fields - this can be useful for cases where the consuming
- // component's logic depends on certain fields being in a valid state.
- // Invalid input, on the other hand, should only be reported once we want to display feedback to the user.
- // (eg.: After a field has been touched and moved away from, a submit-button has been clicked, ...)
- formField.state = reportInvalidInput ? isValid : isValid || null;
- formField.feedback = reportInvalidInput ? getFeedbackForElement(feedbackMap, el) : '';
+ // This makes sure we always report valid fields - this can be useful for cases where the consuming
+ // component's logic depends on certain fields being in a valid state.
+ // Invalid input, on the other hand, should only be reported once we want to display feedback to the user.
+ // (eg.: After a field has been touched and moved away from, a submit-button has been clicked, ...)
+ formField.state = reportInvalidInput ? isValid : isValid || null;
+ formField.feedback = reportInvalidInput ? getFeedbackForElement(feedbackMap, el) : '';
- // eslint-disable-next-line no-param-reassign
- form.state = isEveryFieldValid(form);
-};
+ // eslint-disable-next-line no-param-reassign
+ form.state = isEveryFieldValid(form);
+ };
/**
* Takes an object that allows to add or change custom feedback messages.
diff --git a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
index 99e7170bcfa..d2d347b49ca 100644
--- a/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
+++ b/app/assets/javascripts/work_items/components/notes/work_item_add_note.vue
@@ -172,8 +172,8 @@ export default {
return {
'timeline-entry note-form': this.isNewDiscussion,
// eslint-disable-next-line @gitlab/require-i18n-strings
- 'note note-wrapper note-comment discussion-reply-holder gl-border-t-0! clearfix': !this
- .isNewDiscussion,
+ 'note note-wrapper note-comment discussion-reply-holder gl-border-t-0! clearfix':
+ !this.isNewDiscussion,
'gl-pt-0! is-replying': this.isEditing,
'internal-note': this.isInternalThread,
};
diff --git a/app/helpers/organizations/organization_helper.rb b/app/helpers/organizations/organization_helper.rb
index 230cc3289ab..8c137ec0e02 100644
--- a/app/helpers/organizations/organization_helper.rb
+++ b/app/helpers/organizations/organization_helper.rb
@@ -93,6 +93,7 @@ module Organizations
projects_empty_state_svg_path: image_path('illustrations/empty-state/empty-projects-md.svg'),
groups_empty_state_svg_path: image_path('illustrations/empty-state/empty-groups-md.svg'),
new_group_path: new_groups_organization_path(organization),
+ groups_path: groups_organization_path(organization),
new_project_path: new_project_path,
can_create_group: can?(current_user, :create_group, organization),
can_create_project: current_user&.can_create_project?,
diff --git a/app/services/upload_service.rb b/app/services/upload_service.rb
index 39d1ffa4d6b..dbeca2fac01 100644
--- a/app/services/upload_service.rb
+++ b/app/services/upload_service.rb
@@ -1,9 +1,6 @@
# frozen_string_literal: true
class UploadService
- # Temporarily introduced for upload API: https://gitlab.com/gitlab-org/gitlab/-/issues/325788
- attr_accessor :override_max_attachment_size
-
def initialize(model, file, uploader_class = FileUploader, **uploader_context)
@model = model
@file = file
@@ -25,6 +22,6 @@ class UploadService
attr_reader :model, :file, :uploader_class, :uploader_context
def max_attachment_size
- override_max_attachment_size || Gitlab::CurrentSettings.max_attachment_size.megabytes.to_i
+ Gitlab::CurrentSettings.max_attachment_size.megabytes.to_i
end
end
diff --git a/config/events/view_admin_push_rule_pageload.yml b/config/events/view_admin_push_rule_pageload.yml
new file mode 100644
index 00000000000..6afae3716b4
--- /dev/null
+++ b/config/events/view_admin_push_rule_pageload.yml
@@ -0,0 +1,16 @@
+---
+description: Tracks pageviews for the admin push rules page
+internal_events: true
+action: view_admin_push_rule_pageload
+identifiers:
+- user
+product_group: personal_productivity
+milestone: '17.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157494
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_push_rule_pageload_monthly.yml b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_push_rule_pageload_monthly.yml
new file mode 100644
index 00000000000..f2ae6f2986c
--- /dev/null
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_view_admin_push_rule_pageload_monthly.yml
@@ -0,0 +1,22 @@
+---
+key_path: redis_hll_counters.count_distinct_user_id_from_view_admin_push_rule_pageload_monthly
+description: Monthly count of unique users who visit the admin push rule page
+product_group: personal_productivity
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: '17.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157494
+time_frame: 28d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+events:
+- name: view_admin_push_rule_pageload
+ unique: user.id
diff --git a/config/metrics/counts_28d/count_total_view_admin_push_rule_pageload_monthly.yml b/config/metrics/counts_28d/count_total_view_admin_push_rule_pageload_monthly.yml
new file mode 100644
index 00000000000..2b848ada05a
--- /dev/null
+++ b/config/metrics/counts_28d/count_total_view_admin_push_rule_pageload_monthly.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.count_total_view_admin_push_rule_pageload_monthly
+description: Monthly count of total users who visited the admin push rule page
+product_group: personal_productivity
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: '17.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157494
+time_frame: 28d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+events:
+- name: view_admin_push_rule_pageload
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_view_admin_push_rule_pageload_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_view_admin_push_rule_pageload_weekly.yml
new file mode 100644
index 00000000000..0a821fc34b5
--- /dev/null
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_view_admin_push_rule_pageload_weekly.yml
@@ -0,0 +1,22 @@
+---
+key_path: redis_hll_counters.count_distinct_user_id_from_view_admin_push_rule_pageload_weekly
+description: Weekly count of unique users who visit the admin push rule page
+product_group: personal_productivity
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: '17.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157494
+time_frame: 7d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+events:
+- name: view_admin_push_rule_pageload
+ unique: user.id
diff --git a/config/metrics/counts_7d/count_total_view_admin_push_rule_pageload_weekly.yml b/config/metrics/counts_7d/count_total_view_admin_push_rule_pageload_weekly.yml
new file mode 100644
index 00000000000..9cd98846b11
--- /dev/null
+++ b/config/metrics/counts_7d/count_total_view_admin_push_rule_pageload_weekly.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.count_total_view_admin_push_rule_pageload_weekly
+description: Weekly count of total users who visited the admin push rule page
+product_group: personal_productivity
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: '17.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157494
+time_frame: 7d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+events:
+- name: view_admin_push_rule_pageload
diff --git a/doc/development/database/database_lab.md b/doc/development/database/database_lab.md
index 94a1f68ac8a..4df0cd24e52 100644
--- a/doc/development/database/database_lab.md
+++ b/doc/development/database/database_lab.md
@@ -143,13 +143,13 @@ To access the database lab instances, you must:
Host lb-bastion.db-lab.gitlab.com
User ${USER}
IdentitiesOnly yes
- IdentityFile ~/.ssh/ed25519
+ IdentityFile ~/.ssh/id_ed25519
Host *.gitlab-db-lab.internal
User ${USER}
PreferredAuthentications publickey
IdentitiesOnly yes
- IdentityFile ~/.ssh/ed25519
+ IdentityFile ~/.ssh/id_ed25519
ProxyCommand ssh lb-bastion.db-lab.gitlab.com -W %h:%p
```
diff --git a/doc/security/token_overview.md b/doc/security/token_overview.md
index d6f313e6e9b..b434f449f20 100644
--- a/doc/security/token_overview.md
+++ b/doc/security/token_overview.md
@@ -325,23 +325,23 @@ To replace the token:
## Troubleshooting
-### Identify personal, project and group access tokens expiring on a certain date using the Rails console
+### Identify personal, project, and group access tokens expiring on a certain date
-Use either of these scripts in self-managed instances to identify tokens affected by
+Use these scripts in self-managed instances to identify tokens affected by
[incident 18003](https://gitlab.com/gitlab-com/gl-infra/production/-/issues/18003).
Run the script from your terminal window in either:
- A [Rails console session](../administration/operations/rails_console.md#starting-a-rails-console-session).
- Using the [Rails Runner](../administration/operations/rails_console.md#using-the-rails-runner).
-Both scripts return results in this format:
+These scripts return results in this format:
```plaintext
Expired Group Access Token in Group ID 25, Token ID: 8, Name: Example Token, Scopes: ["read_api", "create_runner"], Last used:
Expired Project Access Token in Project ID 2, Token ID: 9, Name: Test Token, Scopes: ["api", "read_registry", "write_registry"], Last used: 2022-02-11 13:22:14 UTC
```
-#### expired_tokens.rb
+#### Find all tokens expiring on a specific date
This script finds tokens that expire on a specific date.
@@ -357,13 +357,17 @@ To use it:
1. In your terminal window, connect to your instance.
1. Start a Rails console session with `sudo gitlab-rails console`.
-1. Paste in the entire script. Change the `expires_at_date` to the date one year after your instance was upgraded to GitLab 16.0.
+1. Depending on your needs, copy either the entire [`expired_tokens.rb`](#expired_tokensrb)
+ or [`expired_tokens_date_range.rb`](#expired_tokens_date_rangerb) script below, and paste it into the console.
+ Change the `expires_at_date` to the date one year after your instance was upgraded to GitLab 16.0.
1. Press Enter.
:::TabTitle Rails Runner
1. In your terminal window, connect to your instance.
-1. Copy this entire script, and save it as a file on your instance:
+1. Depending on your needs, copy either the entire [`expired_tokens.rb`](#expired_tokensrb)
+ or [`expired_tokens_date_range.rb`](#expired_tokens_date_rangerb) script below, and save it
+ as a file on your instance:
- Name it `expired_tokens.rb`.
- Change the `expires_at_date` to the date one year after your instance was upgraded to GitLab 16.0.
- The file must be accessible to `git:git`.
@@ -377,10 +381,13 @@ For more information, see the [Rails Runner troubleshooting section](../administ
::EndTabs
+##### `expired_tokens.rb`
+
+This script requires you to know the exact date your GitLab instance
+was upgraded to GitLab 16.0.
+
```ruby
-# This script requires you to know the exact date your GitLab instance
-# was upgraded to GitLab 16.0. Change this value to the date one year after
-# your GitLab instance was upgraded.
+# Change this value to the date one year after your GitLab instance was upgraded.
expires_at_date = "2024-05-22"
@@ -399,7 +406,7 @@ PersonalAccessToken.project_access_token.where(expires_at: expires_at_date).find
end
```
-#### expired_tokens_date_range.rb
+#### Find tokens expiring in a given month
This script finds tokens that expire in a particular month. You don't need to know
the exact date your instance was upgraded to GitLab 16.0. To use it:
@@ -409,13 +416,14 @@ the exact date your instance was upgraded to GitLab 16.0. To use it:
:::TabTitle Rails console session
1. In your terminal window, start a Rails console session with `sudo gitlab-rails console`.
-1. Paste in the entire script. If desired, change the `date_range` to a different range.
+1. Paste in the entire [`tokens_with_no_expiry.rb`](#tokens_with_no_expiryrb) script below.
+ If desired, change the `date_range` to a different range.
1. Press Enter.
:::TabTitle Rails Runner
1. In your terminal window, connect to your instance.
-1. Copy this entire script, and save it as a file on your instance:
+1. Copy this entire [`tokens_with_no_expiry.rb`](#tokens_with_no_expiryrb) script below, and save it as a file on your instance:
- Name it `expired_tokens_date_range.rb`.
- If desired, change the `date_range` to a different range.
- The file must be accessible to `git:git`.
@@ -430,6 +438,8 @@ For more information, see the [Rails Runner troubleshooting section](../administ
::EndTabs
+##### `expired_tokens_date_range.rb`
+
```ruby
# This script enables you to search for tokens that expire within a
# certain date range (like 1.month) from the current date. Use it if
@@ -452,7 +462,7 @@ PersonalAccessToken.project_access_token.where(expires_at: Date.today .. Date.to
end
```
-#### dates_when_most_of_tokens_expire.rb
+#### Identify dates when many tokens expire
This script identifies dates when most of tokens expire. You can use it in combination with other scripts on this page to identify and extend large batches of tokens that may be approaching their expiration date, in case your team has not yet set up token rotation.
@@ -471,13 +481,14 @@ To use it:
:::TabTitle Rails console session
1. In your terminal window, start a Rails console session with `sudo gitlab-rails console`.
-1. Paste in the entire script.
+1. Paste in the entire [`dates_when_most_of_tokens_expire.rb`](#dates_when_most_of_tokens_expirerb) script.
1. Press Enter.
:::TabTitle Rails Runner
1. In your terminal window, connect to your instance.
-1. Copy this entire script, and save it as a file on your instance:
+1. Copy this entire [`dates_when_most_of_tokens_expire.rb`](#dates_when_most_of_tokens_expirerb)
+ script, and save it as a file on your instance:
- Name it `dates_when_most_of_tokens_expire.rb`.
- The file must be accessible to `git:git`.
1. Run this command, changing `/path/to/dates_when_most_of_tokens_expire.rb`
@@ -491,6 +502,8 @@ For more information, see the [Rails Runner troubleshooting section](../administ
::EndTabs
+##### `dates_when_most_of_tokens_expire.rb`
+
```ruby
PersonalAccessToken
.select(:expires_at, Arel.sql('count(*)'))
@@ -503,11 +516,14 @@ PersonalAccessToken
end
```
-#### tokens_with_no_expiry.rb
+#### Find tokens with no expiration date
-This script finds tokens that do not have an expiry date, that is, `expires_at` is set to `NULL`. For users who have not yet upgraded to GitLab version 16.0 or later, the token `expires_at` value will be `NULL` and can be used to identify tokens that will be set with an expiration date.
+This script finds tokens that lack an expiration date: `expires_at` is `NULL`. For users
+who have not yet upgraded to GitLab version 16.0 or later, the token `expires_at`
+value is `NULL`, and can be used to identify tokens to add an expiration date to.
-You can use this script in either the [Rails console](../administration/operations/rails_console.md) or the [Rails Runner](../administration/operations/rails_console.md#using-the-rails-runner):
+You can use this script in either the [Rails console](../administration/operations/rails_console.md)
+or the [Rails Runner](../administration/operations/rails_console.md#using-the-rails-runner):
::Tabs
@@ -515,9 +531,29 @@ You can use this script in either the [Rails console](../administration/operatio
1. In your terminal window, connect to your instance.
1. Start a Rails console session with `sudo gitlab-rails console`.
-1. Paste in the entire script.
+1. Paste in the entire [`tokens_with_no_expiry.rb`](#tokens_with_no_expiryrb) script below.
1. Press Enter.
+:::TabTitle Rails Runner
+
+1. In your terminal window, connect to your instance.
+1. Copy this entire [`tokens_with_no_expiry.rb`](#tokens_with_no_expiryrb) script below, and save it as a file on your instance:
+ - Name it `tokens_with_no_expiry.rb`.
+ - The file must be accessible to `git:git`.
+1. Run this command, changing the path to the _full_ path to your `tokens_with_no_expiry.rb` file:
+
+ ```shell
+ sudo gitlab-rails runner /path/to/tokens_with_no_expiry.rb
+ ```
+
+For more information, see the [Rails Runner troubleshooting section](../administration/operations/rails_console.md#troubleshooting).
+
+::EndTabs
+
+##### `tokens_with_no_expiry.rb`
+
+This script finds tokens without a value set for `expires_at`.
+
```ruby
# This script finds tokens which do not have an expires_at value set.
@@ -536,22 +572,6 @@ You can use this script in either the [Rails console](../administration/operatio
end
```
-:::TabTitle Rails Runner
-
-1. In your terminal window, connect to your instance.
-1. Copy this entire script, and save it as a file on your instance:
- - Name it `tokens_with_no_expiry.rb`.
- - The file must be accessible to `git:git`.
-1. Run this command, changing the path to the _full_ path to your `tokens_with_no_expiry.rb` file:
-
- ```shell
- sudo gitlab-rails runner /path/to/tokens_with_no_expiry.rb
- ```
-
-For more information, see the [Rails Runner troubleshooting section](../administration/operations/rails_console.md#troubleshooting).
-
-::EndTabs
-
### Extend token lifetime
Delay the expiration of certain tokens with this script.
@@ -563,7 +583,7 @@ If this date is approaching and there are tokens that have not yet
been rotated, you can use this script to delay expiration and give
users more time to rotate their tokens.
-#### extend_expiring_tokens.rb
+#### Extend lifetime for specific tokens
This script extends the lifetime of all tokens which expire on a specified date, including:
@@ -581,13 +601,14 @@ To use the script:
:::TabTitle Rails console session
1. In your terminal window, start a Rails console session with `sudo gitlab-rails console`.
-1. Paste in the entire script. If desired, change the `expiring_date` to a different date.
+1. Paste in the entire [`extend_expiring_tokens.rb`](#extend_expiring_tokensrb) script below.
+ If desired, change the `expiring_date` to a different date.
1. Press Enter.
:::TabTitle Rails Runner
1. In your terminal window, connect to your instance.
-1. Copy this entire script, and save it as a file on your instance:
+1. Copy this entire [`extend_expiring_tokens.rb`](#extend_expiring_tokensrb) script below, and save it as a file on your instance:
- Name it `extend_expiring_tokens.rb`.
- If desired, change the `expiring_date` to a different date.
- The file must be accessible to `git:git`.
@@ -602,6 +623,8 @@ For more information, see the [Rails Runner troubleshooting section](../administ
::EndTabs
+##### `extend_expiring_tokens.rb`
+
```ruby
expiring_date = Date.new(2024, 5, 30)
new_expires_at = 6.months.from_now
diff --git a/doc/update/versions/gitlab_16_changes.md b/doc/update/versions/gitlab_16_changes.md
index bdef72d65f7..2b2bd2212ec 100644
--- a/doc/update/versions/gitlab_16_changes.md
+++ b/doc/update/versions/gitlab_16_changes.md
@@ -1220,7 +1220,7 @@ date set at one year from the date of upgrade.
Before this automatic expiry date is applied, you should do the following to minimize disruption:
-1. [Identify any access tokens without an expiration date](../../security/token_overview.md#identify-personal-project-and-group-access-tokens-expiring-on-a-certain-date-using-the-rails-console).
+1. [Identify any access tokens without an expiration date](../../security/token_overview.md#find-tokens-with-no-expiration-date).
1. [Give those tokens an expiration date](../../security/token_overview.md#extend-token-lifetime).
For more information, see the:
diff --git a/doc/update/versions/gitlab_17_changes.md b/doc/update/versions/gitlab_17_changes.md
index ee9b9ffbd48..103bd497356 100644
--- a/doc/update/versions/gitlab_17_changes.md
+++ b/doc/update/versions/gitlab_17_changes.md
@@ -108,7 +108,7 @@ date set at one year from the date of upgrade.
Before this automatic expiry date is applied, you should do the following to minimize disruption:
-1. [Identify any access tokens without an expiration date](../../security/token_overview.md#identify-personal-project-and-group-access-tokens-expiring-on-a-certain-date-using-the-rails-console).
+1. [Identify any access tokens without an expiration date](../../security/token_overview.md#find-tokens-with-no-expiration-date).
1. [Give those tokens an expiration date](../../security/token_overview.md#extend-token-lifetime).
For more information, see the:
diff --git a/doc/user/index.md b/doc/user/index.md
index 782f4710af9..6e0d65f61d0 100644
--- a/doc/user/index.md
+++ b/doc/user/index.md
@@ -11,7 +11,7 @@ organize your work, create and secure your application, and analyze its performa
| | | |
|--|--|--|
-| [**Learn Git**](../topics/git/index.md) **{chevron-right}**
Common commands and workflows. | [**Set up your organization**](../topics/set_up_organization.md) **{chevron-right}**
Users, groups, namespaces, SSH keys.| [**Organize work with projects**](../user/project/organize_work_with_projects.md) **{chevron-right}**
Project visibility, search, badges, layout.| -| [**Plan and track work**](../topics/plan_and_track.md) **{chevron-right}**
Epics, issues, milestones, labels.| [**Manage your code**](../topics/manage_code.md) **{chevron-right}**
Repositories, merge requests, remote development. | [**Use CI/CD to build your application**](../topics/build_your_application.md) **{chevron-right}**
Runners, jobs, pipelines, variables. | -| [**Secure your application**](../user/application_security/secure_your_application.md) **{chevron-right}**
Container, dependency, and vulnerability scans. | [**Deploy and release your application**](../topics/release_your_application.md) **{chevron-right}**
Environments, packages, review apps, GitLab Pages. | [**Monitor application performance**](../operations/index.md) **{chevron-right}**
Error tracking, incident management. | -| [**Monitor runner usage**](https://docs.gitlab.com/runner/monitoring/index.html) **{chevron-right}**
Prometheus metrics | [**Manage your infrastructure**](../user/infrastructure/index.md) **{chevron-right}**
Terraform and Kubernetes deployments.| [**Analyze GitLab usage**](../user/analytics/index.md) **{chevron-right}**
Instance, group, and project analytics. | +| [**Manage your organization**](../topics/set_up_organization.md) **{chevron-right}**
Users, groups, namespaces, SSH keys.| [**Organize work with projects**](../user/project/organize_work_with_projects.md) **{chevron-right}**
Project visibility, search, badges, layout.| [**Plan and track work**](../topics/plan_and_track.md) **{chevron-right}**
Epics, issues, milestones, labels.| +| [**Learn Git**](../topics/git/index.md) **{chevron-right}**
Common commands and workflows. | [**Manage your code**](../topics/manage_code.md) **{chevron-right}**
Repositories, merge requests, remote development. | [**Use CI/CD to build your application**](../topics/build_your_application.md) **{chevron-right}**
Runners, jobs, pipelines, variables. | +| [**Secure your application**](../user/application_security/secure_your_application.md) **{chevron-right}**
Container, dependency, and vulnerability scans. | [**Deploy and release your application**](../topics/release_your_application.md) **{chevron-right}**
Environments, packages, review apps, GitLab Pages. | [**Manage your infrastructure**](../user/infrastructure/index.md) **{chevron-right}**
Terraform and Kubernetes deployments. | +| [**Monitor application performance**](../operations/index.md) **{chevron-right}**
Error tracking, incident management. | [**Monitor runner performance**](https://docs.gitlab.com/runner/monitoring/index.html) **{chevron-right}**
Prometheus metrics |[**Analyze GitLab usage**](../user/analytics/index.md) **{chevron-right}**
Instance, group, and project analytics. | diff --git a/lib/api/api.rb b/lib/api/api.rb index ff3a158fbe8..a6ab6f97557 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -278,6 +278,7 @@ module API mount ::API::Keys mount ::API::Lint mount ::API::Markdown + mount ::API::MarkdownUploads mount ::API::MavenPackages mount ::API::Members mount ::API::MergeRequestApprovals diff --git a/lib/api/markdown_uploads.rb b/lib/api/markdown_uploads.rb new file mode 100644 index 00000000000..a85c7fc76a6 --- /dev/null +++ b/lib/api/markdown_uploads.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +module API + class MarkdownUploads < ::API::Base + feature_category :team_planning + + resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do + desc 'Workhorse authorize the file upload' do + detail 'This feature was introduced in GitLab 13.11' + success code: 200 + failure [ + { code: 404, message: 'Not found' } + ] + tags %w[projects] + end + post ':id/uploads/authorize' do + require_gitlab_workhorse! + + status 200 + content_type Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE + FileUploader.workhorse_authorize(has_length: false, maximum_size: user_project.max_attachment_size) + end + + desc 'Upload a file' do + success code: 201, model: Entities::ProjectUpload + failure [ + { code: 404, message: 'Not found' } + ] + tags %w[projects] + end + params do + requires :file, types: [Rack::Multipart::UploadedFile, ::API::Validations::Types::WorkhorseFile], + desc: 'The attachment file to be uploaded', documentation: { type: 'file' } + end + post ':id/uploads' do + upload = UploadService.new(user_project, params[:file]).execute + + present upload, with: Entities::ProjectUpload + end + end + end +end diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 5b0b0bee531..6e95571299e 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -87,28 +87,6 @@ module API accepted! end - def exempt_from_global_attachment_size?(user_project) - list = ::Gitlab::RackAttack::UserAllowlist.new(ENV['GITLAB_UPLOAD_API_ALLOWLIST']) - list.include?(user_project.id) - end - - # Temporarily introduced for upload API: https://gitlab.com/gitlab-org/gitlab/-/issues/325788 - def project_attachment_size(user_project) - return PROJECT_ATTACHMENT_SIZE_EXEMPT if exempt_from_global_attachment_size?(user_project) - - user_project.max_attachment_size - end - - # This is to help determine which projects to use in https://gitlab.com/gitlab-org/gitlab/-/issues/325788 - def log_if_upload_exceed_max_size(user_project, file) - return if file.size <= user_project.max_attachment_size - - if file.size > user_project.max_attachment_size - allowed = exempt_from_global_attachment_size?(user_project) - Gitlab::AppLogger.info({ message: "File exceeds maximum size", file_bytes: file.size, project_id: user_project.id, project_path: user_project.full_path, upload_allowed: allowed }) - end - end - def validate_projects_api_rate_limit_for_unauthenticated_users! check_rate_limit!(:projects_api_rate_limit_unauthenticated, scope: [ip_address]) if current_user.blank? end @@ -866,42 +844,6 @@ module API end end - desc 'Workhorse authorize the file upload' do - detail 'This feature was introduced in GitLab 13.11' - success code: 200 - failure [ - { code: 404, message: 'Not found' } - ] - tags %w[projects] - end - post ':id/uploads/authorize', feature_category: :not_owned do # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned - require_gitlab_workhorse! - - status 200 - content_type Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE - FileUploader.workhorse_authorize(has_length: false, maximum_size: project_attachment_size(user_project)) - end - - desc 'Upload a file' do - success code: 201, model: Entities::ProjectUpload - failure [ - { code: 404, message: 'Not found' } - ] - tags %w[projects] - end - params do - requires :file, types: [Rack::Multipart::UploadedFile, ::API::Validations::Types::WorkhorseFile], desc: 'The attachment file to be uploaded', documentation: { type: 'file' } - end - post ":id/uploads", feature_category: :not_owned do # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned - log_if_upload_exceed_max_size(user_project, params[:file]) - - service = UploadService.new(user_project, params[:file]) - service.override_max_attachment_size = project_attachment_size(user_project) - upload = service.execute - - present upload, with: Entities::ProjectUpload - end - desc 'Get the users list of a project' do success code: 200, model: Entities::UserBasic failure [ diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 72cc70459a9..9d6db254748 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -838,9 +838,6 @@ msgstr "" msgid "%{group_name}&%{epic_iid} · created %{epic_created} by %{author}" msgstr "" -msgid "%{group} is a top level group and cannot be immediately deleted from here. Please visit the %{linkStart}Group Settings%{linkEnd} to immediately delete this group." -msgstr "" - msgid "%{host} sign-in from new location" msgstr "" @@ -48359,15 +48356,12 @@ msgstr "" msgid "SecurityOrchestration|When license scanner finds any license matching %{licenses}%{detection} in an open merge request %{targeting}%{branches}%{branchExceptionsString}" msgstr "" -msgid "SecurityOrchestration|With the default security job template" +msgid "SecurityOrchestration|With the %{template} security job template" msgstr "" msgid "SecurityOrchestration|With the following customized CI variables:" msgstr "" -msgid "SecurityOrchestration|With the latest security job template" -msgstr "" - msgid "SecurityOrchestration|YAML" msgstr "" diff --git a/package.json b/package.json index de1aeaf36ef..85dd89cf777 100644 --- a/package.json +++ b/package.json @@ -187,6 +187,7 @@ "popper.js": "^1.16.1", "portal-vue": "^2.1.7", "postcss": "^8.4.35", + "prettier": "^3.3.2", "prosemirror-markdown": "1.11.2", "raphael": "^2.2.7", "raw-loader": "^4.0.2", @@ -284,7 +285,7 @@ "miragejs": "^0.1.40", "mock-apollo-client": "1.2.0", "nodemon": "^2.0.19", - "prettier": "2.2.1", + "prettier-plugin-tailwindcss": "^0.6.5", "prosemirror-test-builder": "^1.1.1", "stylelint": "^16.1.0", "swagger-cli": "^4.0.4", diff --git a/scripts/frontend/clean_css_assets.mjs b/scripts/frontend/clean_css_assets.mjs index de89b9820f7..4dde42e8ded 100755 --- a/scripts/frontend/clean_css_assets.mjs +++ b/scripts/frontend/clean_css_assets.mjs @@ -5,7 +5,7 @@ import { join, resolve, relative, dirname } from 'node:path'; import { mkdir, stat, readFile, writeFile } from 'node:fs/promises'; import glob from 'glob'; import * as esbuild from 'esbuild'; -import prettier from 'prettier'; +import * as prettier from 'prettier'; /** * VISION: This script could be made more generalizable, to be able to diff --git a/scripts/frontend/create_jsconfig.js b/scripts/frontend/create_jsconfig.js index 28674aacd45..be4b83aee2b 100755 --- a/scripts/frontend/create_jsconfig.js +++ b/scripts/frontend/create_jsconfig.js @@ -75,7 +75,9 @@ async function createJsConfig() { }; // Stringify, format and update the config file - const jsConfigString = prettier.format(JSON.stringify(jsConfig, null, 2), { parser: 'json' }); + const jsConfigString = await prettier.format(JSON.stringify(jsConfig, null, 2), { + parser: 'json', + }); await fs.writeFile(PATH_JS_CONFIG, jsConfigString); } diff --git a/scripts/frontend/tailwind_all_the_way.mjs b/scripts/frontend/tailwind_all_the_way.mjs index 2d6df177b5f..d09e2db4933 100755 --- a/scripts/frontend/tailwind_all_the_way.mjs +++ b/scripts/frontend/tailwind_all_the_way.mjs @@ -8,7 +8,7 @@ import path from 'node:path'; import _ from 'lodash'; import postcss from 'postcss'; -import prettier from 'prettier'; +import * as prettier from 'prettier'; import tailwindcss from 'tailwindcss/lib/plugin.js'; import { diff --git a/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js b/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js index e01dde8f62c..fe2fe7c6fbc 100644 --- a/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js +++ b/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js @@ -111,8 +111,7 @@ describe('AlertsSettingsWrapper', () => { type: 'HTTP', active: true, name: 'test', - url: - 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/eddd36969b2d3d6a.json', + url: 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/eddd36969b2d3d6a.json', token: '7eb24af194116411ec8d66b58c6b0d2e', }, ], diff --git a/spec/frontend/alerts_settings/components/mocks/apollo_mock.js b/spec/frontend/alerts_settings/components/mocks/apollo_mock.js index 903b6e0d9c8..afac208d8c3 100644 --- a/spec/frontend/alerts_settings/components/mocks/apollo_mock.js +++ b/spec/frontend/alerts_settings/components/mocks/apollo_mock.js @@ -43,8 +43,7 @@ export const getIntegrationsQueryResponse = { type: 'HTTP', active: true, name: 'Test 5', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', token: '89eb01df471d990ff5162a1c640408cf', apiUrl: null, }, @@ -54,8 +53,7 @@ export const getIntegrationsQueryResponse = { type: 'HTTP', active: true, name: 'Test 9999', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-9999/b78a566e1776cfc2.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-9999/b78a566e1776cfc2.json', token: 'f7579aa03844e07af3b1f0fca3f79f81', apiUrl: null, }, @@ -65,8 +63,7 @@ export const getIntegrationsQueryResponse = { type: 'HTTP', active: true, name: 'Test 6', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-6/3e828ae28a240222.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-6/3e828ae28a240222.json', token: '6536102a607a5dd74fcdde921f2349ee', apiUrl: null, }, @@ -107,8 +104,7 @@ export const destroyIntegrationResponse = { type: 'HTTP', active: true, name: 'Test 5', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', token: '89eb01df471d990ff5162a1c640408cf', apiUrl: null, payloadExample: '{"field": "value"}', @@ -128,8 +124,7 @@ export const destroyIntegrationResponseWithErrors = { type: 'HTTP', active: true, name: 'Test 5', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', token: '89eb01df471d990ff5162a1c640408cf', apiUrl: null, payloadExample: '{"field": "value"}', @@ -152,8 +147,7 @@ export const prometheusIntegrationsList = { type: 'HTTP', active: true, name: 'test', - url: - 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/eddd36969b2d3d6a.json', + url: 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/eddd36969b2d3d6a.json', token: '7eb24af194116411ec8d66b58c6b0d2e', apiUrl: null, }, @@ -173,8 +167,7 @@ export const prometheusIntegrationsList = { type: 'HTTP', active: false, name: 'test', - url: - 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/bcd64c85f918a2e2.json', + url: 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/bcd64c85f918a2e2.json', token: '5c8101533d970a55d5c105f8abff2192', apiUrl: null, }, diff --git a/spec/frontend/api_spec.js b/spec/frontend/api_spec.js index c37b649e847..07a4b560805 100644 --- a/spec/frontend/api_spec.js +++ b/spec/frontend/api_spec.js @@ -1584,8 +1584,7 @@ describe('Api', () => { title: 'My title 1', created_at: '2021-10-29T16:59:55.229Z', expires_at: null, - key: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDLvQzRX960N7dxPdge9o5a96+M4GEGQ7rxT2D3wAQDtQFjQV5ZcKb5wfeLtYLe3kRVI4lCO10PXeQppb1XBaYmVO31IaRkcgmMEPVyfp76Dp4CJZz6aMEbbcqfaHkDre0Fa8kzTXnBJVh2NeDbBfGMjFM5NRQLhKykodNsepO6dQ== dummy@gitlab.com', + key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDLvQzRX960N7dxPdge9o5a96+M4GEGQ7rxT2D3wAQDtQFjQV5ZcKb5wfeLtYLe3kRVI4lCO10PXeQppb1XBaYmVO31IaRkcgmMEPVyfp76Dp4CJZz6aMEbbcqfaHkDre0Fa8kzTXnBJVh2NeDbBfGMjFM5NRQLhKykodNsepO6dQ== dummy@gitlab.com', fingerprint: '81:93:63:b9:1e:24:a2:aa:e0:87:d3:3f:42:81:f2:c2', projects_with_write_access: [ { diff --git a/spec/frontend/boards/components/board_filtered_search_spec.js b/spec/frontend/boards/components/board_filtered_search_spec.js index dbc9b42380b..f6b0647bfcb 100644 --- a/spec/frontend/boards/components/board_filtered_search_spec.js +++ b/spec/frontend/boards/components/board_filtered_search_spec.js @@ -147,8 +147,7 @@ describe('BoardFilteredSearch', () => { expect(updateHistory).toHaveBeenCalledWith({ title: '', replace: true, - url: - 'http://test.host/?not[health_status]=atRisk&author_username=root&label_name[]=label&label_name[]=label%262&assignee_username=root&milestone_title=New%20Milestone&iteration_id=Any&iteration_cadence_id=3&types=INCIDENT&weight=2&release_tag=v1.0.0&health_status=onTrack', + url: 'http://test.host/?not[health_status]=atRisk&author_username=root&label_name[]=label&label_name[]=label%262&assignee_username=root&milestone_title=New%20Milestone&iteration_id=Any&iteration_cadence_id=3&types=INCIDENT&weight=2&release_tag=v1.0.0&health_status=onTrack', }); }); diff --git a/spec/frontend/captcha/captcha_modal_axios_interceptor_spec.js b/spec/frontend/captcha/captcha_modal_axios_interceptor_spec.js index a4eecabcf28..7e43fc7e677 100644 --- a/spec/frontend/captcha/captcha_modal_axios_interceptor_spec.js +++ b/spec/frontend/captcha/captcha_modal_axios_interceptor_spec.js @@ -42,10 +42,8 @@ describe('registerCaptchaModalInterceptor', () => { } const data = JSON.parse(config.data); - const { - 'X-GitLab-Captcha-Response': captchaResponse, - 'X-GitLab-Spam-Log-Id': spamLogId, - } = config.headers; + const { 'X-GitLab-Captcha-Response': captchaResponse, 'X-GitLab-Spam-Log-Id': spamLogId } = + config.headers; if (captchaResponse === CAPTCHA_RESPONSE && spamLogId === SPAM_LOG_ID) { return [HTTP_STATUS_OK, { ...data, method: config.method, CAPTCHA_SUCCESS }]; diff --git a/spec/frontend/ci/job_details/utils_spec.js b/spec/frontend/ci/job_details/utils_spec.js index 7b5a97f3939..be158681fb5 100644 --- a/spec/frontend/ci/job_details/utils_spec.js +++ b/spec/frontend/ci/job_details/utils_spec.js @@ -72,8 +72,7 @@ describe('Job utils', () => { { content: [ { - text: - 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', + text: 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', }, ], lineNumber: 7, @@ -175,8 +174,7 @@ describe('Job utils', () => { { content: [ { - text: - 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', + text: 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', }, ], lineNumber: 19, diff --git a/spec/frontend/ci/jobs_mock_data.js b/spec/frontend/ci/jobs_mock_data.js index 04f250e08c0..39cf99595ac 100644 --- a/spec/frontend/ci/jobs_mock_data.js +++ b/spec/frontend/ci/jobs_mock_data.js @@ -1508,8 +1508,7 @@ export const mockJobLog = [ offset: 415, content: [ { - text: - 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', + text: 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', }, ], section: 'prepare-executor', @@ -1605,8 +1604,7 @@ export const mockJobLog = [ offset: 1327, content: [ { - text: - 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', + text: 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', }, ], section: 'step-script', diff --git a/spec/frontend/ci/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js b/spec/frontend/ci/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js index 0296ab5a65c..d7ce92c03a7 100644 --- a/spec/frontend/ci/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js +++ b/spec/frontend/ci/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js @@ -69,12 +69,8 @@ describe('Pipeline config reference card', () => { }; it('tracks help page links', () => { - const { - CI_EXAMPLES_LINK, - CI_HELP_LINK, - CI_NEEDS_LINK, - CI_YAML_LINK, - } = pipelineEditorTrackingOptions.actions.helpDrawerLinks; + const { CI_EXAMPLES_LINK, CI_HELP_LINK, CI_NEEDS_LINK, CI_YAML_LINK } = + pipelineEditorTrackingOptions.actions.helpDrawerLinks; testTracker(findCiExamplesLink(), CI_EXAMPLES_LINK); testTracker(findCiIntroLink(), CI_HELP_LINK); diff --git a/spec/frontend/ci/pipeline_editor/mock_data.js b/spec/frontend/ci/pipeline_editor/mock_data.js index 9926bf9e15c..cd641d0f27e 100644 --- a/spec/frontend/ci/pipeline_editor/mock_data.js +++ b/spec/frontend/ci/pipeline_editor/mock_data.js @@ -124,10 +124,8 @@ const mockJobFields = { export const mockIncludesWithBlob = { location: 'test-include.yml', type: 'local', - blob: - 'http://gdk.test:3000/root/upstream/-/blob/dd54f00bb3645f8ddce7665d2ffb3864540399cb/test-include.yml', - raw: - 'http://gdk.test:3000/root/upstream/-/raw/dd54f00bb3645f8ddce7665d2ffb3864540399cb/test-include.yml', + blob: 'http://gdk.test:3000/root/upstream/-/blob/dd54f00bb3645f8ddce7665d2ffb3864540399cb/test-include.yml', + raw: 'http://gdk.test:3000/root/upstream/-/raw/dd54f00bb3645f8ddce7665d2ffb3864540399cb/test-include.yml', __typename: 'CiConfigInclude', }; @@ -135,8 +133,7 @@ export const mockDefaultIncludes = { location: 'npm.gitlab-ci.yml', type: 'template', blob: null, - raw: - 'https://gitlab.com/gitlab-org/gitlab/-/raw/master/lib/gitlab/ci/templates/npm.gitlab-ci.yml', + raw: 'https://gitlab.com/gitlab-org/gitlab/-/raw/master/lib/gitlab/ci/templates/npm.gitlab-ci.yml', __typename: 'CiConfigInclude', }; @@ -146,10 +143,8 @@ export const mockIncludes = [ { location: 'a_really_really_long_name_for_includes_file.yml', type: 'local', - blob: - 'http://gdk.test:3000/root/upstream/-/blob/dd54f00bb3645f8ddce7665d2ffb3864540399cb/a_really_really_long_name_for_includes_file.yml', - raw: - 'http://gdk.test:3000/root/upstream/-/raw/dd54f00bb3645f8ddce7665d2ffb3864540399cb/a_really_really_long_name_for_includes_file.yml', + blob: 'http://gdk.test:3000/root/upstream/-/blob/dd54f00bb3645f8ddce7665d2ffb3864540399cb/a_really_really_long_name_for_includes_file.yml', + raw: 'http://gdk.test:3000/root/upstream/-/raw/dd54f00bb3645f8ddce7665d2ffb3864540399cb/a_really_really_long_name_for_includes_file.yml', __typename: 'CiConfigInclude', }, ]; @@ -317,8 +312,8 @@ export const generateMockProjectBranches = (prefix = '') => ({ }, }); -export const mockTotalBranchResults = generateMockProjectBranches().data.project.repository - .branchNames.length; +export const mockTotalBranchResults = + generateMockProjectBranches().data.project.repository.branchNames.length; export const mockSearchBranches = { data: { diff --git a/spec/frontend/ci/reports/codequality_report/components/codequality_issue_body_spec.js b/spec/frontend/ci/reports/codequality_report/components/codequality_issue_body_spec.js index 847862be183..881924eaec2 100644 --- a/spec/frontend/ci/reports/codequality_report/components/codequality_issue_body_spec.js +++ b/spec/frontend/ci/reports/codequality_report/components/codequality_issue_body_spec.js @@ -11,8 +11,7 @@ describe('code quality issue body issue body', () => { const findGlIcon = () => wrapper.findComponent(GlIcon); const codequalityIssue = { - name: - 'rubygem-rest-client: session fixation vulnerability via Set-Cookie headers in 30x redirection responses', + name: 'rubygem-rest-client: session fixation vulnerability via Set-Cookie headers in 30x redirection responses', path: 'Gemfile.lock', severity: 'normal', type: 'Issue', diff --git a/spec/frontend/ci/reports/codequality_report/mock_data.js b/spec/frontend/ci/reports/codequality_report/mock_data.js index 2c994116db6..557e073906f 100644 --- a/spec/frontend/ci/reports/codequality_report/mock_data.js +++ b/spec/frontend/ci/reports/codequality_report/mock_data.js @@ -28,8 +28,7 @@ export const parsedReportIssues = { 'Method `long_if` has a Cognitive Complexity of 10 (exceeds 5 allowed). Consider refactoring.', file_path: 'codequality.rb', line: 5, - name: - 'Method `long_if` has a Cognitive Complexity of 10 (exceeds 5 allowed). Consider refactoring.', + name: 'Method `long_if` has a Cognitive Complexity of 10 (exceeds 5 allowed). Consider refactoring.', path: 'codequality.rb', severity: 'minor', urlPath: 'null/codequality.rb#L5', diff --git a/spec/frontend/ci/runner/components/runner_update_form_spec.js b/spec/frontend/ci/runner/components/runner_update_form_spec.js index a1ecedc6846..172b2aac8a4 100644 --- a/spec/frontend/ci/runner/components/runner_update_form_spec.js +++ b/spec/frontend/ci/runner/components/runner_update_form_spec.js @@ -137,15 +137,8 @@ describe('RunnerUpdateForm', () => { await submitFormAndWait(); // Some read-only fields are not submitted - const { - __typename, - shortSha, - runnerType, - createdAt, - createdBy, - status, - ...submitted - } = mockRunner; + const { __typename, shortSha, runnerType, createdAt, createdBy, status, ...submitted } = + mockRunner; expectToHaveSubmittedRunnerContaining(submitted); }); diff --git a/spec/frontend/content_editor/test_utils.js b/spec/frontend/content_editor/test_utils.js index f1c9fd47eb7..af7fe1b9a9e 100644 --- a/spec/frontend/content_editor/test_utils.js +++ b/spec/frontend/content_editor/test_utils.js @@ -141,7 +141,10 @@ export const createTestContentEditorExtension = ({ commands = [] } = {}) => { return commands.reduce( (accum, commandName) => ({ ...accum, - [commandName]: (...params) => () => commandMocks[commandName](...params), + [commandName]: + (...params) => + () => + commandMocks[commandName](...params), }), {}, ); diff --git a/spec/frontend/contribution_events/utils.js b/spec/frontend/contribution_events/utils.js index f91a4dd800b..f05e9ff99d0 100644 --- a/spec/frontend/contribution_events/utils.js +++ b/spec/frontend/contribution_events/utils.js @@ -40,20 +40,22 @@ const findEventByActionAndTargetType = (action, targetType) => () => events.find((event) => event.action === action && event.target?.type === targetType); const findEventByActionAndIssueType = (action, issueType) => () => events.find((event) => event.action === action && event.target.issue_type === issueType); -const findPushEvent = ({ - isNew = false, - isRemoved = false, - refType = PUSH_EVENT_REF_TYPE_BRANCH, - commitCount = 1, -} = {}) => () => - events.find( - ({ action, ref, commit }) => - action === EVENT_TYPE_PUSHED && - ref.is_new === isNew && - ref.is_removed === isRemoved && - ref.type === refType && - commit.count === commitCount, - ); +const findPushEvent = + ({ + isNew = false, + isRemoved = false, + refType = PUSH_EVENT_REF_TYPE_BRANCH, + commitCount = 1, + } = {}) => + () => + events.find( + ({ action, ref, commit }) => + action === EVENT_TYPE_PUSHED && + ref.is_new === isNew && + ref.is_removed === isRemoved && + ref.type === refType && + commit.count === commitCount, + ); const findEventByActionAndNoteableType = (action, noteableType) => () => events.find((event) => event.action === action && event.noteable?.type === noteableType); const findCommentedSnippet = (resourceParentType) => () => diff --git a/spec/frontend/crm/crm_form_spec.js b/spec/frontend/crm/crm_form_spec.js index 083b49b7c30..a7d052b3260 100644 --- a/spec/frontend/crm/crm_form_spec.js +++ b/spec/frontend/crm/crm_form_spec.js @@ -52,7 +52,10 @@ describe('Reusable form component', () => { handler = jest.fn().mockImplementation((key) => DEFAULT_RESPONSES[key]); - const hanlderWithKey = (key) => (...args) => handler(key, ...args); + const hanlderWithKey = + (key) => + (...args) => + handler(key, ...args); fakeApollo = createMockApollo([ [createContactMutation, hanlderWithKey('createContact')], diff --git a/spec/frontend/deploy_tokens/components/new_deploy_token_spec.js b/spec/frontend/deploy_tokens/components/new_deploy_token_spec.js index b149a94f3a1..e1d9ad63c18 100644 --- a/spec/frontend/deploy_tokens/components/new_deploy_token_spec.js +++ b/spec/frontend/deploy_tokens/components/new_deploy_token_spec.js @@ -61,13 +61,8 @@ describe('New Deploy Token', () => { readPackageRegistryValue = true, writePackageRegistryValue = true, } = {}) => { - const [ - readRepo, - readRegistry, - writeRegistry, - readPackageRegistry, - writePackageRegistry, - ] = findAllCheckboxes().wrappers; + const [readRepo, readRegistry, writeRegistry, readPackageRegistry, writePackageRegistry] = + findAllCheckboxes().wrappers; readRepo.vm.$emit('input', readRepoValue); readRegistry.vm.$emit('input', readRegistryValue); diff --git a/spec/frontend/diffs/components/diff_expansion_cell_spec.js b/spec/frontend/diffs/components/diff_expansion_cell_spec.js index 34bb73ccf26..90f08d018ad 100644 --- a/spec/frontend/diffs/components/diff_expansion_cell_spec.js +++ b/spec/frontend/diffs/components/diff_expansion_cell_spec.js @@ -177,9 +177,8 @@ describe('DiffExpansionCell', () => { }); it('on expand down clicked, dispatch loadMoreLines', () => { - mockFile[lineSources[diffViewType]][lineIndex + 1] = getDiffFileMock()[ - lineSources[diffViewType] - ][lineIndex]; + mockFile[lineSources[diffViewType]][lineIndex + 1] = + getDiffFileMock()[lineSources[diffViewType]][lineIndex]; const nextLine = getLine(mockFile, diffViewType, lineIndex + 1); nextLine.meta_data.old_pos = 300; diff --git a/spec/frontend/environments/graphql/resolvers/k8s_logs_spec.js b/spec/frontend/environments/graphql/resolvers/k8s_logs_spec.js index 535260d85e0..258ea50ab14 100644 --- a/spec/frontend/environments/graphql/resolvers/k8s_logs_spec.js +++ b/spec/frontend/environments/graphql/resolvers/k8s_logs_spec.js @@ -36,9 +36,10 @@ describe('k8sLogs', () => { it('should request pods logs if no container is specified', async () => { await k8sLogs(null, { configuration, namespace, podName }, { client }); - expect( - watchStream.subscribeToStreamMock, - ).toHaveBeenCalledWith('/api/v1/namespaces/default/pods/test-pod/log', { follow: true }); + expect(watchStream.subscribeToStreamMock).toHaveBeenCalledWith( + '/api/v1/namespaces/default/pods/test-pod/log', + { follow: true }, + ); }); it('should request specific container logs if container is specified', async () => { diff --git a/spec/frontend/environments/new_environment_item_spec.js b/spec/frontend/environments/new_environment_item_spec.js index a0ef95bc89a..4cb109d4a79 100644 --- a/spec/frontend/environments/new_environment_item_spec.js +++ b/spec/frontend/environments/new_environment_item_spec.js @@ -64,8 +64,7 @@ describe('~/environments/components/new_environment_item.vue', () => { it('truncates the name if it is very long', () => { const environment = { ...resolvedEnvironment, - name: - 'this is a really long name that should be truncated because otherwise it would look strange in the UI', + name: 'this is a really long name that should be truncated because otherwise it would look strange in the UI', }; wrapper = createWrapper({ propsData: { environment }, apolloProvider: createApolloProvider() }); diff --git a/spec/frontend/error_tracking/components/error_details_info_spec.js b/spec/frontend/error_tracking/components/error_details_info_spec.js index a3f4b0e0dd8..975ea0d14d5 100644 --- a/spec/frontend/error_tracking/components/error_details_info_spec.js +++ b/spec/frontend/error_tracking/components/error_details_info_spec.js @@ -187,9 +187,8 @@ describe('ErrorDetails', () => { }); await findExternalUrlLink().trigger('click'); - const { category, action, label, property } = trackClickErrorLinkToSentryOptions( - 'external-url', - ); + const { category, action, label, property } = + trackClickErrorLinkToSentryOptions('external-url'); expect(Tracking.event).toHaveBeenCalledWith(category, action, { label, property }); }); }); diff --git a/spec/frontend/gfm_auto_complete_spec.js b/spec/frontend/gfm_auto_complete_spec.js index f6dfe86251b..029839a6d1c 100644 --- a/spec/frontend/gfm_auto_complete_spec.js +++ b/spec/frontend/gfm_auto_complete_spec.js @@ -586,8 +586,7 @@ describe('GfmAutoComplete', () => { '
',
title: 'My Group',
search: 'MyGroup my-group',
- icon:
- '',
+ icon: '',
},
]);
});
diff --git a/spec/frontend/ide/components/branches/item_spec.js b/spec/frontend/ide/components/branches/item_spec.js
index 4cae146cbd2..277d9b947e5 100644
--- a/spec/frontend/ide/components/branches/item_spec.js
+++ b/spec/frontend/ide/components/branches/item_spec.js
@@ -45,8 +45,9 @@ describe('IDE branch item', () => {
});
it('renders link to branch', () => {
- const expectedHref = router.resolve(`/project/${TEST_PROJECT_ID}/edit/${TEST_BRANCH.name}`)
- .href;
+ const expectedHref = router.resolve(
+ `/project/${TEST_PROJECT_ID}/edit/${TEST_BRANCH.name}`,
+ ).href;
expect(wrapper.text()).toMatch('a');
expect(wrapper.attributes('href')).toBe(expectedHref);
diff --git a/spec/frontend/ide/components/commit_sidebar/message_field_spec.js b/spec/frontend/ide/components/commit_sidebar/message_field_spec.js
index 3403a7b8ad9..654501540fc 100644
--- a/spec/frontend/ide/components/commit_sidebar/message_field_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/message_field_spec.js
@@ -55,8 +55,7 @@ describe('IDE commit message field', () => {
it('highlights characters over 50 length', async () => {
await wrapper.setProps({
- text:
- 'text less than 50 chars that should not highlighted. text more than 50 should be highlighted',
+ text: 'text less than 50 chars that should not highlighted. text more than 50 should be highlighted',
});
expect(findHighlights()).toHaveLength(1);
@@ -80,8 +79,7 @@ describe('IDE commit message field', () => {
it('highlights body text more than 72 characters', async () => {
await wrapper.setProps({
- text:
- 'subject line\nbody content that will be highlighted when it is more than 72 characters in length',
+ text: 'subject line\nbody content that will be highlighted when it is more than 72 characters in length',
});
expect(findHighlights()).toHaveLength(2);
@@ -91,8 +89,7 @@ describe('IDE commit message field', () => {
it('highlights body text & subject line', async () => {
await wrapper.setProps({
- text:
- 'text less than 50 chars that should not highlighted\nbody content that will be highlighted when it is more than 72 characters in length',
+ text: 'text less than 50 chars that should not highlighted\nbody content that will be highlighted when it is more than 72 characters in length',
});
expect(findHighlights()).toHaveLength(2);
diff --git a/spec/frontend/image_diff/replaced_image_diff_spec.js b/spec/frontend/image_diff/replaced_image_diff_spec.js
index d789e964e4c..cb062bbb3ec 100644
--- a/spec/frontend/image_diff/replaced_image_diff_spec.js
+++ b/spec/frontend/image_diff/replaced_image_diff_spec.js
@@ -43,12 +43,10 @@ describe('ReplacedImageDiff', () => {
function setupImageFrameEls() {
replacedImageDiff.imageFrameEls = [];
- replacedImageDiff.imageFrameEls[viewTypes.TWO_UP] = element.querySelector(
- '.two-up .js-image-frame',
- );
- replacedImageDiff.imageFrameEls[viewTypes.SWIPE] = element.querySelector(
- '.swipe .js-image-frame',
- );
+ replacedImageDiff.imageFrameEls[viewTypes.TWO_UP] =
+ element.querySelector('.two-up .js-image-frame');
+ replacedImageDiff.imageFrameEls[viewTypes.SWIPE] =
+ element.querySelector('.swipe .js-image-frame');
replacedImageDiff.imageFrameEls[viewTypes.ONION_SKIN] = element.querySelector(
'.onion-skin .js-image-frame',
);
@@ -59,9 +57,8 @@ describe('ReplacedImageDiff', () => {
replacedImageDiff.viewModesEls[viewTypes.TWO_UP] = element.querySelector(
'.view-modes-menu .two-up',
);
- replacedImageDiff.viewModesEls[viewTypes.SWIPE] = element.querySelector(
- '.view-modes-menu .swipe',
- );
+ replacedImageDiff.viewModesEls[viewTypes.SWIPE] =
+ element.querySelector('.view-modes-menu .swipe');
replacedImageDiff.viewModesEls[viewTypes.ONION_SKIN] = element.querySelector(
'.view-modes-menu .onion-skin',
);
diff --git a/spec/frontend/invite_members/components/invite_modal_base_spec.js b/spec/frontend/invite_members/components/invite_modal_base_spec.js
index 4f4288196ab..84ef4e7623d 100644
--- a/spec/frontend/invite_members/components/invite_modal_base_spec.js
+++ b/spec/frontend/invite_members/components/invite_modal_base_spec.js
@@ -236,7 +236,8 @@ describe('InviteModalBase', () => {
});
describe('when users limit is not reached', () => {
- const textRegex = /Select a role\s*Read more about role permissions\s*Access expiration date \(optional\)/;
+ const textRegex =
+ /Select a role\s*Read more about role permissions\s*Access expiration date \(optional\)/;
beforeEach(() => {
createComponent({ props: { reachedLimit: false }, stubs: { GlModal, GlFormGroup } });
diff --git a/spec/frontend/issues/show/components/description_spec.js b/spec/frontend/issues/show/components/description_spec.js
index 1fe853677c5..effc4043144 100644
--- a/spec/frontend/issues/show/components/description_spec.js
+++ b/spec/frontend/issues/show/components/description_spec.js
@@ -284,9 +284,10 @@ describe('Description component', () => {
});
it('calls a mutation to create a task', () => {
- const workItemTypeIdForTask = projectWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes.find(
- (node) => node.name === 'Task',
- ).id;
+ const workItemTypeIdForTask =
+ projectWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes.find(
+ (node) => node.name === 'Task',
+ ).id;
const { confidential, iteration, milestone } = issueDetailsResponse.data.issue;
expect(createWorkItemMutationHandler).toHaveBeenCalledWith({
input: {
diff --git a/spec/frontend/lib/apollo/persistence_mapper_spec.js b/spec/frontend/lib/apollo/persistence_mapper_spec.js
index 2efe28d2ca7..22809aa1c83 100644
--- a/spec/frontend/lib/apollo/persistence_mapper_spec.js
+++ b/spec/frontend/lib/apollo/persistence_mapper_spec.js
@@ -39,81 +39,82 @@ describe('lib/apollo/persistence_mapper', () => {
'Project:gid://gitlab/Project/6': {
__typename: 'Project',
id: 'gid://gitlab/Project/6',
- 'issues({"after":null,"before":"eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0wOSAwNDowNToyOS4yMzI5NDUwMDAgKzAwMDAiLCJpZCI6IjE1NjYifQ","includeSubepics":true,"last":20,"sort":"UPDATED_DESC","state":"opened","types":["ISSUE","INCIDENT","TEST_CASE","TASK"]})': {
- __typename: 'IssueConnection',
- __persist: true,
- pageInfo: {
- __typename: 'PageInfo',
- hasNextPage: true,
- hasPreviousPage: false,
- startCursor:
- 'eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0xMCAxMjozNjo1NC41NDYxNzEwMDAgKzAwMDAiLCJpZCI6IjQ4MyJ9',
- endCursor:
- 'eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0wOSAwNDowNToyOS4zMDE3NDcwMDAgKzAwMDAiLCJpZCI6IjE1NjcifQ',
+ 'issues({"after":null,"before":"eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0wOSAwNDowNToyOS4yMzI5NDUwMDAgKzAwMDAiLCJpZCI6IjE1NjYifQ","includeSubepics":true,"last":20,"sort":"UPDATED_DESC","state":"opened","types":["ISSUE","INCIDENT","TEST_CASE","TASK"]})':
+ {
+ __typename: 'IssueConnection',
+ __persist: true,
+ pageInfo: {
+ __typename: 'PageInfo',
+ hasNextPage: true,
+ hasPreviousPage: false,
+ startCursor:
+ 'eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0xMCAxMjozNjo1NC41NDYxNzEwMDAgKzAwMDAiLCJpZCI6IjQ4MyJ9',
+ endCursor:
+ 'eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0wOSAwNDowNToyOS4zMDE3NDcwMDAgKzAwMDAiLCJpZCI6IjE1NjcifQ',
+ },
+ nodes: [
+ {
+ __ref: 'Issue:gid://gitlab/Issue/483',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1585',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1584',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1583',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1582',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1581',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1580',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1579',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1578',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1577',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1576',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1575',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1574',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1573',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1572',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1571',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1570',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1569',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1568',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1567',
+ },
+ ],
},
- nodes: [
- {
- __ref: 'Issue:gid://gitlab/Issue/483',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1585',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1584',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1583',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1582',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1581',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1580',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1579',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1578',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1577',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1576',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1575',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1574',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1573',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1572',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1571',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1570',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1569',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1568',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1567',
- },
- ],
- },
},
'Issue:gid://gitlab/Issue/483': {
__typename: 'Issue',
diff --git a/spec/frontend/notes/components/discussion_actions_spec.js b/spec/frontend/notes/components/discussion_actions_spec.js
index 652b6643084..2bbf4203e45 100644
--- a/spec/frontend/notes/components/discussion_actions_spec.js
+++ b/spec/frontend/notes/components/discussion_actions_spec.js
@@ -20,23 +20,25 @@ const createUnallowedNote = () =>
describe('DiscussionActions', () => {
let wrapper;
- const createComponentFactory = (shallow = true) => (props, options) => {
- const store = createStore();
- const mountFn = shallow ? shallowMount : mount;
+ const createComponentFactory =
+ (shallow = true) =>
+ (props, options) => {
+ const store = createStore();
+ const mountFn = shallow ? shallowMount : mount;
- wrapper = mountFn(DiscussionActions, {
- store,
- propsData: {
- discussion: discussionMock,
- isResolving: false,
- resolveButtonTitle: 'Resolve discussion',
- resolveWithIssuePath: '/some/issue/path',
- shouldShowJumpToNextDiscussion: true,
- ...props,
- },
- ...options,
- });
- };
+ wrapper = mountFn(DiscussionActions, {
+ store,
+ propsData: {
+ discussion: discussionMock,
+ isResolving: false,
+ resolveButtonTitle: 'Resolve discussion',
+ resolveWithIssuePath: '/some/issue/path',
+ shouldShowJumpToNextDiscussion: true,
+ ...props,
+ },
+ ...options,
+ });
+ };
describe('rendering', () => {
const createComponent = createComponentFactory();
diff --git a/spec/frontend/notes/mock_data.js b/spec/frontend/notes/mock_data.js
index e254ed9b372..e1e17e61548 100644
--- a/spec/frontend/notes/mock_data.js
+++ b/spec/frontend/notes/mock_data.js
@@ -695,8 +695,7 @@ export const notesWithDescriptionChanges = [
noteable_type: 'Issue',
resolvable: false,
noteable_iid: 12,
- note:
- 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+ note: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
note_html:
'
Common commands and workflows. | [**Set up your organization**](../topics/set_up_organization.md) **{chevron-right}**
Users, groups, namespaces, SSH keys.| [**Organize work with projects**](../user/project/organize_work_with_projects.md) **{chevron-right}**
Project visibility, search, badges, layout.| -| [**Plan and track work**](../topics/plan_and_track.md) **{chevron-right}**
Epics, issues, milestones, labels.| [**Manage your code**](../topics/manage_code.md) **{chevron-right}**
Repositories, merge requests, remote development. | [**Use CI/CD to build your application**](../topics/build_your_application.md) **{chevron-right}**
Runners, jobs, pipelines, variables. | -| [**Secure your application**](../user/application_security/secure_your_application.md) **{chevron-right}**
Container, dependency, and vulnerability scans. | [**Deploy and release your application**](../topics/release_your_application.md) **{chevron-right}**
Environments, packages, review apps, GitLab Pages. | [**Monitor application performance**](../operations/index.md) **{chevron-right}**
Error tracking, incident management. | -| [**Monitor runner usage**](https://docs.gitlab.com/runner/monitoring/index.html) **{chevron-right}**
Prometheus metrics | [**Manage your infrastructure**](../user/infrastructure/index.md) **{chevron-right}**
Terraform and Kubernetes deployments.| [**Analyze GitLab usage**](../user/analytics/index.md) **{chevron-right}**
Instance, group, and project analytics. | +| [**Manage your organization**](../topics/set_up_organization.md) **{chevron-right}**
Users, groups, namespaces, SSH keys.| [**Organize work with projects**](../user/project/organize_work_with_projects.md) **{chevron-right}**
Project visibility, search, badges, layout.| [**Plan and track work**](../topics/plan_and_track.md) **{chevron-right}**
Epics, issues, milestones, labels.| +| [**Learn Git**](../topics/git/index.md) **{chevron-right}**
Common commands and workflows. | [**Manage your code**](../topics/manage_code.md) **{chevron-right}**
Repositories, merge requests, remote development. | [**Use CI/CD to build your application**](../topics/build_your_application.md) **{chevron-right}**
Runners, jobs, pipelines, variables. | +| [**Secure your application**](../user/application_security/secure_your_application.md) **{chevron-right}**
Container, dependency, and vulnerability scans. | [**Deploy and release your application**](../topics/release_your_application.md) **{chevron-right}**
Environments, packages, review apps, GitLab Pages. | [**Manage your infrastructure**](../user/infrastructure/index.md) **{chevron-right}**
Terraform and Kubernetes deployments. | +| [**Monitor application performance**](../operations/index.md) **{chevron-right}**
Error tracking, incident management. | [**Monitor runner performance**](https://docs.gitlab.com/runner/monitoring/index.html) **{chevron-right}**
Prometheus metrics |[**Analyze GitLab usage**](../user/analytics/index.md) **{chevron-right}**
Instance, group, and project analytics. | diff --git a/lib/api/api.rb b/lib/api/api.rb index ff3a158fbe8..a6ab6f97557 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -278,6 +278,7 @@ module API mount ::API::Keys mount ::API::Lint mount ::API::Markdown + mount ::API::MarkdownUploads mount ::API::MavenPackages mount ::API::Members mount ::API::MergeRequestApprovals diff --git a/lib/api/markdown_uploads.rb b/lib/api/markdown_uploads.rb new file mode 100644 index 00000000000..a85c7fc76a6 --- /dev/null +++ b/lib/api/markdown_uploads.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +module API + class MarkdownUploads < ::API::Base + feature_category :team_planning + + resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do + desc 'Workhorse authorize the file upload' do + detail 'This feature was introduced in GitLab 13.11' + success code: 200 + failure [ + { code: 404, message: 'Not found' } + ] + tags %w[projects] + end + post ':id/uploads/authorize' do + require_gitlab_workhorse! + + status 200 + content_type Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE + FileUploader.workhorse_authorize(has_length: false, maximum_size: user_project.max_attachment_size) + end + + desc 'Upload a file' do + success code: 201, model: Entities::ProjectUpload + failure [ + { code: 404, message: 'Not found' } + ] + tags %w[projects] + end + params do + requires :file, types: [Rack::Multipart::UploadedFile, ::API::Validations::Types::WorkhorseFile], + desc: 'The attachment file to be uploaded', documentation: { type: 'file' } + end + post ':id/uploads' do + upload = UploadService.new(user_project, params[:file]).execute + + present upload, with: Entities::ProjectUpload + end + end + end +end diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 5b0b0bee531..6e95571299e 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -87,28 +87,6 @@ module API accepted! end - def exempt_from_global_attachment_size?(user_project) - list = ::Gitlab::RackAttack::UserAllowlist.new(ENV['GITLAB_UPLOAD_API_ALLOWLIST']) - list.include?(user_project.id) - end - - # Temporarily introduced for upload API: https://gitlab.com/gitlab-org/gitlab/-/issues/325788 - def project_attachment_size(user_project) - return PROJECT_ATTACHMENT_SIZE_EXEMPT if exempt_from_global_attachment_size?(user_project) - - user_project.max_attachment_size - end - - # This is to help determine which projects to use in https://gitlab.com/gitlab-org/gitlab/-/issues/325788 - def log_if_upload_exceed_max_size(user_project, file) - return if file.size <= user_project.max_attachment_size - - if file.size > user_project.max_attachment_size - allowed = exempt_from_global_attachment_size?(user_project) - Gitlab::AppLogger.info({ message: "File exceeds maximum size", file_bytes: file.size, project_id: user_project.id, project_path: user_project.full_path, upload_allowed: allowed }) - end - end - def validate_projects_api_rate_limit_for_unauthenticated_users! check_rate_limit!(:projects_api_rate_limit_unauthenticated, scope: [ip_address]) if current_user.blank? end @@ -866,42 +844,6 @@ module API end end - desc 'Workhorse authorize the file upload' do - detail 'This feature was introduced in GitLab 13.11' - success code: 200 - failure [ - { code: 404, message: 'Not found' } - ] - tags %w[projects] - end - post ':id/uploads/authorize', feature_category: :not_owned do # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned - require_gitlab_workhorse! - - status 200 - content_type Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE - FileUploader.workhorse_authorize(has_length: false, maximum_size: project_attachment_size(user_project)) - end - - desc 'Upload a file' do - success code: 201, model: Entities::ProjectUpload - failure [ - { code: 404, message: 'Not found' } - ] - tags %w[projects] - end - params do - requires :file, types: [Rack::Multipart::UploadedFile, ::API::Validations::Types::WorkhorseFile], desc: 'The attachment file to be uploaded', documentation: { type: 'file' } - end - post ":id/uploads", feature_category: :not_owned do # rubocop:todo Gitlab/AvoidFeatureCategoryNotOwned - log_if_upload_exceed_max_size(user_project, params[:file]) - - service = UploadService.new(user_project, params[:file]) - service.override_max_attachment_size = project_attachment_size(user_project) - upload = service.execute - - present upload, with: Entities::ProjectUpload - end - desc 'Get the users list of a project' do success code: 200, model: Entities::UserBasic failure [ diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 72cc70459a9..9d6db254748 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -838,9 +838,6 @@ msgstr "" msgid "%{group_name}&%{epic_iid} · created %{epic_created} by %{author}" msgstr "" -msgid "%{group} is a top level group and cannot be immediately deleted from here. Please visit the %{linkStart}Group Settings%{linkEnd} to immediately delete this group." -msgstr "" - msgid "%{host} sign-in from new location" msgstr "" @@ -48359,15 +48356,12 @@ msgstr "" msgid "SecurityOrchestration|When license scanner finds any license matching %{licenses}%{detection} in an open merge request %{targeting}%{branches}%{branchExceptionsString}" msgstr "" -msgid "SecurityOrchestration|With the default security job template" +msgid "SecurityOrchestration|With the %{template} security job template" msgstr "" msgid "SecurityOrchestration|With the following customized CI variables:" msgstr "" -msgid "SecurityOrchestration|With the latest security job template" -msgstr "" - msgid "SecurityOrchestration|YAML" msgstr "" diff --git a/package.json b/package.json index de1aeaf36ef..85dd89cf777 100644 --- a/package.json +++ b/package.json @@ -187,6 +187,7 @@ "popper.js": "^1.16.1", "portal-vue": "^2.1.7", "postcss": "^8.4.35", + "prettier": "^3.3.2", "prosemirror-markdown": "1.11.2", "raphael": "^2.2.7", "raw-loader": "^4.0.2", @@ -284,7 +285,7 @@ "miragejs": "^0.1.40", "mock-apollo-client": "1.2.0", "nodemon": "^2.0.19", - "prettier": "2.2.1", + "prettier-plugin-tailwindcss": "^0.6.5", "prosemirror-test-builder": "^1.1.1", "stylelint": "^16.1.0", "swagger-cli": "^4.0.4", diff --git a/scripts/frontend/clean_css_assets.mjs b/scripts/frontend/clean_css_assets.mjs index de89b9820f7..4dde42e8ded 100755 --- a/scripts/frontend/clean_css_assets.mjs +++ b/scripts/frontend/clean_css_assets.mjs @@ -5,7 +5,7 @@ import { join, resolve, relative, dirname } from 'node:path'; import { mkdir, stat, readFile, writeFile } from 'node:fs/promises'; import glob from 'glob'; import * as esbuild from 'esbuild'; -import prettier from 'prettier'; +import * as prettier from 'prettier'; /** * VISION: This script could be made more generalizable, to be able to diff --git a/scripts/frontend/create_jsconfig.js b/scripts/frontend/create_jsconfig.js index 28674aacd45..be4b83aee2b 100755 --- a/scripts/frontend/create_jsconfig.js +++ b/scripts/frontend/create_jsconfig.js @@ -75,7 +75,9 @@ async function createJsConfig() { }; // Stringify, format and update the config file - const jsConfigString = prettier.format(JSON.stringify(jsConfig, null, 2), { parser: 'json' }); + const jsConfigString = await prettier.format(JSON.stringify(jsConfig, null, 2), { + parser: 'json', + }); await fs.writeFile(PATH_JS_CONFIG, jsConfigString); } diff --git a/scripts/frontend/tailwind_all_the_way.mjs b/scripts/frontend/tailwind_all_the_way.mjs index 2d6df177b5f..d09e2db4933 100755 --- a/scripts/frontend/tailwind_all_the_way.mjs +++ b/scripts/frontend/tailwind_all_the_way.mjs @@ -8,7 +8,7 @@ import path from 'node:path'; import _ from 'lodash'; import postcss from 'postcss'; -import prettier from 'prettier'; +import * as prettier from 'prettier'; import tailwindcss from 'tailwindcss/lib/plugin.js'; import { diff --git a/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js b/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js index e01dde8f62c..fe2fe7c6fbc 100644 --- a/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js +++ b/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js @@ -111,8 +111,7 @@ describe('AlertsSettingsWrapper', () => { type: 'HTTP', active: true, name: 'test', - url: - 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/eddd36969b2d3d6a.json', + url: 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/eddd36969b2d3d6a.json', token: '7eb24af194116411ec8d66b58c6b0d2e', }, ], diff --git a/spec/frontend/alerts_settings/components/mocks/apollo_mock.js b/spec/frontend/alerts_settings/components/mocks/apollo_mock.js index 903b6e0d9c8..afac208d8c3 100644 --- a/spec/frontend/alerts_settings/components/mocks/apollo_mock.js +++ b/spec/frontend/alerts_settings/components/mocks/apollo_mock.js @@ -43,8 +43,7 @@ export const getIntegrationsQueryResponse = { type: 'HTTP', active: true, name: 'Test 5', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', token: '89eb01df471d990ff5162a1c640408cf', apiUrl: null, }, @@ -54,8 +53,7 @@ export const getIntegrationsQueryResponse = { type: 'HTTP', active: true, name: 'Test 9999', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-9999/b78a566e1776cfc2.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-9999/b78a566e1776cfc2.json', token: 'f7579aa03844e07af3b1f0fca3f79f81', apiUrl: null, }, @@ -65,8 +63,7 @@ export const getIntegrationsQueryResponse = { type: 'HTTP', active: true, name: 'Test 6', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-6/3e828ae28a240222.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-6/3e828ae28a240222.json', token: '6536102a607a5dd74fcdde921f2349ee', apiUrl: null, }, @@ -107,8 +104,7 @@ export const destroyIntegrationResponse = { type: 'HTTP', active: true, name: 'Test 5', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', token: '89eb01df471d990ff5162a1c640408cf', apiUrl: null, payloadExample: '{"field": "value"}', @@ -128,8 +124,7 @@ export const destroyIntegrationResponseWithErrors = { type: 'HTTP', active: true, name: 'Test 5', - url: - 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', + url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/alerts/notify/test-5/d4875758e67334f3.json', token: '89eb01df471d990ff5162a1c640408cf', apiUrl: null, payloadExample: '{"field": "value"}', @@ -152,8 +147,7 @@ export const prometheusIntegrationsList = { type: 'HTTP', active: true, name: 'test', - url: - 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/eddd36969b2d3d6a.json', + url: 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/eddd36969b2d3d6a.json', token: '7eb24af194116411ec8d66b58c6b0d2e', apiUrl: null, }, @@ -173,8 +167,7 @@ export const prometheusIntegrationsList = { type: 'HTTP', active: false, name: 'test', - url: - 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/bcd64c85f918a2e2.json', + url: 'http://192.168.1.152:3000/root/autodevops/alerts/notify/test/bcd64c85f918a2e2.json', token: '5c8101533d970a55d5c105f8abff2192', apiUrl: null, }, diff --git a/spec/frontend/api_spec.js b/spec/frontend/api_spec.js index c37b649e847..07a4b560805 100644 --- a/spec/frontend/api_spec.js +++ b/spec/frontend/api_spec.js @@ -1584,8 +1584,7 @@ describe('Api', () => { title: 'My title 1', created_at: '2021-10-29T16:59:55.229Z', expires_at: null, - key: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDLvQzRX960N7dxPdge9o5a96+M4GEGQ7rxT2D3wAQDtQFjQV5ZcKb5wfeLtYLe3kRVI4lCO10PXeQppb1XBaYmVO31IaRkcgmMEPVyfp76Dp4CJZz6aMEbbcqfaHkDre0Fa8kzTXnBJVh2NeDbBfGMjFM5NRQLhKykodNsepO6dQ== dummy@gitlab.com', + key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDLvQzRX960N7dxPdge9o5a96+M4GEGQ7rxT2D3wAQDtQFjQV5ZcKb5wfeLtYLe3kRVI4lCO10PXeQppb1XBaYmVO31IaRkcgmMEPVyfp76Dp4CJZz6aMEbbcqfaHkDre0Fa8kzTXnBJVh2NeDbBfGMjFM5NRQLhKykodNsepO6dQ== dummy@gitlab.com', fingerprint: '81:93:63:b9:1e:24:a2:aa:e0:87:d3:3f:42:81:f2:c2', projects_with_write_access: [ { diff --git a/spec/frontend/boards/components/board_filtered_search_spec.js b/spec/frontend/boards/components/board_filtered_search_spec.js index dbc9b42380b..f6b0647bfcb 100644 --- a/spec/frontend/boards/components/board_filtered_search_spec.js +++ b/spec/frontend/boards/components/board_filtered_search_spec.js @@ -147,8 +147,7 @@ describe('BoardFilteredSearch', () => { expect(updateHistory).toHaveBeenCalledWith({ title: '', replace: true, - url: - 'http://test.host/?not[health_status]=atRisk&author_username=root&label_name[]=label&label_name[]=label%262&assignee_username=root&milestone_title=New%20Milestone&iteration_id=Any&iteration_cadence_id=3&types=INCIDENT&weight=2&release_tag=v1.0.0&health_status=onTrack', + url: 'http://test.host/?not[health_status]=atRisk&author_username=root&label_name[]=label&label_name[]=label%262&assignee_username=root&milestone_title=New%20Milestone&iteration_id=Any&iteration_cadence_id=3&types=INCIDENT&weight=2&release_tag=v1.0.0&health_status=onTrack', }); }); diff --git a/spec/frontend/captcha/captcha_modal_axios_interceptor_spec.js b/spec/frontend/captcha/captcha_modal_axios_interceptor_spec.js index a4eecabcf28..7e43fc7e677 100644 --- a/spec/frontend/captcha/captcha_modal_axios_interceptor_spec.js +++ b/spec/frontend/captcha/captcha_modal_axios_interceptor_spec.js @@ -42,10 +42,8 @@ describe('registerCaptchaModalInterceptor', () => { } const data = JSON.parse(config.data); - const { - 'X-GitLab-Captcha-Response': captchaResponse, - 'X-GitLab-Spam-Log-Id': spamLogId, - } = config.headers; + const { 'X-GitLab-Captcha-Response': captchaResponse, 'X-GitLab-Spam-Log-Id': spamLogId } = + config.headers; if (captchaResponse === CAPTCHA_RESPONSE && spamLogId === SPAM_LOG_ID) { return [HTTP_STATUS_OK, { ...data, method: config.method, CAPTCHA_SUCCESS }]; diff --git a/spec/frontend/ci/job_details/utils_spec.js b/spec/frontend/ci/job_details/utils_spec.js index 7b5a97f3939..be158681fb5 100644 --- a/spec/frontend/ci/job_details/utils_spec.js +++ b/spec/frontend/ci/job_details/utils_spec.js @@ -72,8 +72,7 @@ describe('Job utils', () => { { content: [ { - text: - 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', + text: 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', }, ], lineNumber: 7, @@ -175,8 +174,7 @@ describe('Job utils', () => { { content: [ { - text: - 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', + text: 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', }, ], lineNumber: 19, diff --git a/spec/frontend/ci/jobs_mock_data.js b/spec/frontend/ci/jobs_mock_data.js index 04f250e08c0..39cf99595ac 100644 --- a/spec/frontend/ci/jobs_mock_data.js +++ b/spec/frontend/ci/jobs_mock_data.js @@ -1508,8 +1508,7 @@ export const mockJobLog = [ offset: 415, content: [ { - text: - 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', + text: 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', }, ], section: 'prepare-executor', @@ -1605,8 +1604,7 @@ export const mockJobLog = [ offset: 1327, content: [ { - text: - 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', + text: 'Using docker image sha256:55106bf6ba7f452c38d01ea760affc6ceb67d4b60068ffadab98d1b7b007668c for ruby:2.7 with digest ruby@sha256:23d08a4bae1a12ee3fce017f83204fcf9a02243443e4a516e65e5ff73810a449 ...', }, ], section: 'step-script', diff --git a/spec/frontend/ci/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js b/spec/frontend/ci/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js index 0296ab5a65c..d7ce92c03a7 100644 --- a/spec/frontend/ci/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js +++ b/spec/frontend/ci/pipeline_editor/components/drawer/cards/pipeline_config_reference_card_spec.js @@ -69,12 +69,8 @@ describe('Pipeline config reference card', () => { }; it('tracks help page links', () => { - const { - CI_EXAMPLES_LINK, - CI_HELP_LINK, - CI_NEEDS_LINK, - CI_YAML_LINK, - } = pipelineEditorTrackingOptions.actions.helpDrawerLinks; + const { CI_EXAMPLES_LINK, CI_HELP_LINK, CI_NEEDS_LINK, CI_YAML_LINK } = + pipelineEditorTrackingOptions.actions.helpDrawerLinks; testTracker(findCiExamplesLink(), CI_EXAMPLES_LINK); testTracker(findCiIntroLink(), CI_HELP_LINK); diff --git a/spec/frontend/ci/pipeline_editor/mock_data.js b/spec/frontend/ci/pipeline_editor/mock_data.js index 9926bf9e15c..cd641d0f27e 100644 --- a/spec/frontend/ci/pipeline_editor/mock_data.js +++ b/spec/frontend/ci/pipeline_editor/mock_data.js @@ -124,10 +124,8 @@ const mockJobFields = { export const mockIncludesWithBlob = { location: 'test-include.yml', type: 'local', - blob: - 'http://gdk.test:3000/root/upstream/-/blob/dd54f00bb3645f8ddce7665d2ffb3864540399cb/test-include.yml', - raw: - 'http://gdk.test:3000/root/upstream/-/raw/dd54f00bb3645f8ddce7665d2ffb3864540399cb/test-include.yml', + blob: 'http://gdk.test:3000/root/upstream/-/blob/dd54f00bb3645f8ddce7665d2ffb3864540399cb/test-include.yml', + raw: 'http://gdk.test:3000/root/upstream/-/raw/dd54f00bb3645f8ddce7665d2ffb3864540399cb/test-include.yml', __typename: 'CiConfigInclude', }; @@ -135,8 +133,7 @@ export const mockDefaultIncludes = { location: 'npm.gitlab-ci.yml', type: 'template', blob: null, - raw: - 'https://gitlab.com/gitlab-org/gitlab/-/raw/master/lib/gitlab/ci/templates/npm.gitlab-ci.yml', + raw: 'https://gitlab.com/gitlab-org/gitlab/-/raw/master/lib/gitlab/ci/templates/npm.gitlab-ci.yml', __typename: 'CiConfigInclude', }; @@ -146,10 +143,8 @@ export const mockIncludes = [ { location: 'a_really_really_long_name_for_includes_file.yml', type: 'local', - blob: - 'http://gdk.test:3000/root/upstream/-/blob/dd54f00bb3645f8ddce7665d2ffb3864540399cb/a_really_really_long_name_for_includes_file.yml', - raw: - 'http://gdk.test:3000/root/upstream/-/raw/dd54f00bb3645f8ddce7665d2ffb3864540399cb/a_really_really_long_name_for_includes_file.yml', + blob: 'http://gdk.test:3000/root/upstream/-/blob/dd54f00bb3645f8ddce7665d2ffb3864540399cb/a_really_really_long_name_for_includes_file.yml', + raw: 'http://gdk.test:3000/root/upstream/-/raw/dd54f00bb3645f8ddce7665d2ffb3864540399cb/a_really_really_long_name_for_includes_file.yml', __typename: 'CiConfigInclude', }, ]; @@ -317,8 +312,8 @@ export const generateMockProjectBranches = (prefix = '') => ({ }, }); -export const mockTotalBranchResults = generateMockProjectBranches().data.project.repository - .branchNames.length; +export const mockTotalBranchResults = + generateMockProjectBranches().data.project.repository.branchNames.length; export const mockSearchBranches = { data: { diff --git a/spec/frontend/ci/reports/codequality_report/components/codequality_issue_body_spec.js b/spec/frontend/ci/reports/codequality_report/components/codequality_issue_body_spec.js index 847862be183..881924eaec2 100644 --- a/spec/frontend/ci/reports/codequality_report/components/codequality_issue_body_spec.js +++ b/spec/frontend/ci/reports/codequality_report/components/codequality_issue_body_spec.js @@ -11,8 +11,7 @@ describe('code quality issue body issue body', () => { const findGlIcon = () => wrapper.findComponent(GlIcon); const codequalityIssue = { - name: - 'rubygem-rest-client: session fixation vulnerability via Set-Cookie headers in 30x redirection responses', + name: 'rubygem-rest-client: session fixation vulnerability via Set-Cookie headers in 30x redirection responses', path: 'Gemfile.lock', severity: 'normal', type: 'Issue', diff --git a/spec/frontend/ci/reports/codequality_report/mock_data.js b/spec/frontend/ci/reports/codequality_report/mock_data.js index 2c994116db6..557e073906f 100644 --- a/spec/frontend/ci/reports/codequality_report/mock_data.js +++ b/spec/frontend/ci/reports/codequality_report/mock_data.js @@ -28,8 +28,7 @@ export const parsedReportIssues = { 'Method `long_if` has a Cognitive Complexity of 10 (exceeds 5 allowed). Consider refactoring.', file_path: 'codequality.rb', line: 5, - name: - 'Method `long_if` has a Cognitive Complexity of 10 (exceeds 5 allowed). Consider refactoring.', + name: 'Method `long_if` has a Cognitive Complexity of 10 (exceeds 5 allowed). Consider refactoring.', path: 'codequality.rb', severity: 'minor', urlPath: 'null/codequality.rb#L5', diff --git a/spec/frontend/ci/runner/components/runner_update_form_spec.js b/spec/frontend/ci/runner/components/runner_update_form_spec.js index a1ecedc6846..172b2aac8a4 100644 --- a/spec/frontend/ci/runner/components/runner_update_form_spec.js +++ b/spec/frontend/ci/runner/components/runner_update_form_spec.js @@ -137,15 +137,8 @@ describe('RunnerUpdateForm', () => { await submitFormAndWait(); // Some read-only fields are not submitted - const { - __typename, - shortSha, - runnerType, - createdAt, - createdBy, - status, - ...submitted - } = mockRunner; + const { __typename, shortSha, runnerType, createdAt, createdBy, status, ...submitted } = + mockRunner; expectToHaveSubmittedRunnerContaining(submitted); }); diff --git a/spec/frontend/content_editor/test_utils.js b/spec/frontend/content_editor/test_utils.js index f1c9fd47eb7..af7fe1b9a9e 100644 --- a/spec/frontend/content_editor/test_utils.js +++ b/spec/frontend/content_editor/test_utils.js @@ -141,7 +141,10 @@ export const createTestContentEditorExtension = ({ commands = [] } = {}) => { return commands.reduce( (accum, commandName) => ({ ...accum, - [commandName]: (...params) => () => commandMocks[commandName](...params), + [commandName]: + (...params) => + () => + commandMocks[commandName](...params), }), {}, ); diff --git a/spec/frontend/contribution_events/utils.js b/spec/frontend/contribution_events/utils.js index f91a4dd800b..f05e9ff99d0 100644 --- a/spec/frontend/contribution_events/utils.js +++ b/spec/frontend/contribution_events/utils.js @@ -40,20 +40,22 @@ const findEventByActionAndTargetType = (action, targetType) => () => events.find((event) => event.action === action && event.target?.type === targetType); const findEventByActionAndIssueType = (action, issueType) => () => events.find((event) => event.action === action && event.target.issue_type === issueType); -const findPushEvent = ({ - isNew = false, - isRemoved = false, - refType = PUSH_EVENT_REF_TYPE_BRANCH, - commitCount = 1, -} = {}) => () => - events.find( - ({ action, ref, commit }) => - action === EVENT_TYPE_PUSHED && - ref.is_new === isNew && - ref.is_removed === isRemoved && - ref.type === refType && - commit.count === commitCount, - ); +const findPushEvent = + ({ + isNew = false, + isRemoved = false, + refType = PUSH_EVENT_REF_TYPE_BRANCH, + commitCount = 1, + } = {}) => + () => + events.find( + ({ action, ref, commit }) => + action === EVENT_TYPE_PUSHED && + ref.is_new === isNew && + ref.is_removed === isRemoved && + ref.type === refType && + commit.count === commitCount, + ); const findEventByActionAndNoteableType = (action, noteableType) => () => events.find((event) => event.action === action && event.noteable?.type === noteableType); const findCommentedSnippet = (resourceParentType) => () => diff --git a/spec/frontend/crm/crm_form_spec.js b/spec/frontend/crm/crm_form_spec.js index 083b49b7c30..a7d052b3260 100644 --- a/spec/frontend/crm/crm_form_spec.js +++ b/spec/frontend/crm/crm_form_spec.js @@ -52,7 +52,10 @@ describe('Reusable form component', () => { handler = jest.fn().mockImplementation((key) => DEFAULT_RESPONSES[key]); - const hanlderWithKey = (key) => (...args) => handler(key, ...args); + const hanlderWithKey = + (key) => + (...args) => + handler(key, ...args); fakeApollo = createMockApollo([ [createContactMutation, hanlderWithKey('createContact')], diff --git a/spec/frontend/deploy_tokens/components/new_deploy_token_spec.js b/spec/frontend/deploy_tokens/components/new_deploy_token_spec.js index b149a94f3a1..e1d9ad63c18 100644 --- a/spec/frontend/deploy_tokens/components/new_deploy_token_spec.js +++ b/spec/frontend/deploy_tokens/components/new_deploy_token_spec.js @@ -61,13 +61,8 @@ describe('New Deploy Token', () => { readPackageRegistryValue = true, writePackageRegistryValue = true, } = {}) => { - const [ - readRepo, - readRegistry, - writeRegistry, - readPackageRegistry, - writePackageRegistry, - ] = findAllCheckboxes().wrappers; + const [readRepo, readRegistry, writeRegistry, readPackageRegistry, writePackageRegistry] = + findAllCheckboxes().wrappers; readRepo.vm.$emit('input', readRepoValue); readRegistry.vm.$emit('input', readRegistryValue); diff --git a/spec/frontend/diffs/components/diff_expansion_cell_spec.js b/spec/frontend/diffs/components/diff_expansion_cell_spec.js index 34bb73ccf26..90f08d018ad 100644 --- a/spec/frontend/diffs/components/diff_expansion_cell_spec.js +++ b/spec/frontend/diffs/components/diff_expansion_cell_spec.js @@ -177,9 +177,8 @@ describe('DiffExpansionCell', () => { }); it('on expand down clicked, dispatch loadMoreLines', () => { - mockFile[lineSources[diffViewType]][lineIndex + 1] = getDiffFileMock()[ - lineSources[diffViewType] - ][lineIndex]; + mockFile[lineSources[diffViewType]][lineIndex + 1] = + getDiffFileMock()[lineSources[diffViewType]][lineIndex]; const nextLine = getLine(mockFile, diffViewType, lineIndex + 1); nextLine.meta_data.old_pos = 300; diff --git a/spec/frontend/environments/graphql/resolvers/k8s_logs_spec.js b/spec/frontend/environments/graphql/resolvers/k8s_logs_spec.js index 535260d85e0..258ea50ab14 100644 --- a/spec/frontend/environments/graphql/resolvers/k8s_logs_spec.js +++ b/spec/frontend/environments/graphql/resolvers/k8s_logs_spec.js @@ -36,9 +36,10 @@ describe('k8sLogs', () => { it('should request pods logs if no container is specified', async () => { await k8sLogs(null, { configuration, namespace, podName }, { client }); - expect( - watchStream.subscribeToStreamMock, - ).toHaveBeenCalledWith('/api/v1/namespaces/default/pods/test-pod/log', { follow: true }); + expect(watchStream.subscribeToStreamMock).toHaveBeenCalledWith( + '/api/v1/namespaces/default/pods/test-pod/log', + { follow: true }, + ); }); it('should request specific container logs if container is specified', async () => { diff --git a/spec/frontend/environments/new_environment_item_spec.js b/spec/frontend/environments/new_environment_item_spec.js index a0ef95bc89a..4cb109d4a79 100644 --- a/spec/frontend/environments/new_environment_item_spec.js +++ b/spec/frontend/environments/new_environment_item_spec.js @@ -64,8 +64,7 @@ describe('~/environments/components/new_environment_item.vue', () => { it('truncates the name if it is very long', () => { const environment = { ...resolvedEnvironment, - name: - 'this is a really long name that should be truncated because otherwise it would look strange in the UI', + name: 'this is a really long name that should be truncated because otherwise it would look strange in the UI', }; wrapper = createWrapper({ propsData: { environment }, apolloProvider: createApolloProvider() }); diff --git a/spec/frontend/error_tracking/components/error_details_info_spec.js b/spec/frontend/error_tracking/components/error_details_info_spec.js index a3f4b0e0dd8..975ea0d14d5 100644 --- a/spec/frontend/error_tracking/components/error_details_info_spec.js +++ b/spec/frontend/error_tracking/components/error_details_info_spec.js @@ -187,9 +187,8 @@ describe('ErrorDetails', () => { }); await findExternalUrlLink().trigger('click'); - const { category, action, label, property } = trackClickErrorLinkToSentryOptions( - 'external-url', - ); + const { category, action, label, property } = + trackClickErrorLinkToSentryOptions('external-url'); expect(Tracking.event).toHaveBeenCalledWith(category, action, { label, property }); }); }); diff --git a/spec/frontend/gfm_auto_complete_spec.js b/spec/frontend/gfm_auto_complete_spec.js index f6dfe86251b..029839a6d1c 100644 --- a/spec/frontend/gfm_auto_complete_spec.js +++ b/spec/frontend/gfm_auto_complete_spec.js @@ -586,8 +586,7 @@ describe('GfmAutoComplete', () => { '
',
title: 'My Group',
search: 'MyGroup my-group',
- icon:
- '',
+ icon: '',
},
]);
});
diff --git a/spec/frontend/ide/components/branches/item_spec.js b/spec/frontend/ide/components/branches/item_spec.js
index 4cae146cbd2..277d9b947e5 100644
--- a/spec/frontend/ide/components/branches/item_spec.js
+++ b/spec/frontend/ide/components/branches/item_spec.js
@@ -45,8 +45,9 @@ describe('IDE branch item', () => {
});
it('renders link to branch', () => {
- const expectedHref = router.resolve(`/project/${TEST_PROJECT_ID}/edit/${TEST_BRANCH.name}`)
- .href;
+ const expectedHref = router.resolve(
+ `/project/${TEST_PROJECT_ID}/edit/${TEST_BRANCH.name}`,
+ ).href;
expect(wrapper.text()).toMatch('a');
expect(wrapper.attributes('href')).toBe(expectedHref);
diff --git a/spec/frontend/ide/components/commit_sidebar/message_field_spec.js b/spec/frontend/ide/components/commit_sidebar/message_field_spec.js
index 3403a7b8ad9..654501540fc 100644
--- a/spec/frontend/ide/components/commit_sidebar/message_field_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/message_field_spec.js
@@ -55,8 +55,7 @@ describe('IDE commit message field', () => {
it('highlights characters over 50 length', async () => {
await wrapper.setProps({
- text:
- 'text less than 50 chars that should not highlighted. text more than 50 should be highlighted',
+ text: 'text less than 50 chars that should not highlighted. text more than 50 should be highlighted',
});
expect(findHighlights()).toHaveLength(1);
@@ -80,8 +79,7 @@ describe('IDE commit message field', () => {
it('highlights body text more than 72 characters', async () => {
await wrapper.setProps({
- text:
- 'subject line\nbody content that will be highlighted when it is more than 72 characters in length',
+ text: 'subject line\nbody content that will be highlighted when it is more than 72 characters in length',
});
expect(findHighlights()).toHaveLength(2);
@@ -91,8 +89,7 @@ describe('IDE commit message field', () => {
it('highlights body text & subject line', async () => {
await wrapper.setProps({
- text:
- 'text less than 50 chars that should not highlighted\nbody content that will be highlighted when it is more than 72 characters in length',
+ text: 'text less than 50 chars that should not highlighted\nbody content that will be highlighted when it is more than 72 characters in length',
});
expect(findHighlights()).toHaveLength(2);
diff --git a/spec/frontend/image_diff/replaced_image_diff_spec.js b/spec/frontend/image_diff/replaced_image_diff_spec.js
index d789e964e4c..cb062bbb3ec 100644
--- a/spec/frontend/image_diff/replaced_image_diff_spec.js
+++ b/spec/frontend/image_diff/replaced_image_diff_spec.js
@@ -43,12 +43,10 @@ describe('ReplacedImageDiff', () => {
function setupImageFrameEls() {
replacedImageDiff.imageFrameEls = [];
- replacedImageDiff.imageFrameEls[viewTypes.TWO_UP] = element.querySelector(
- '.two-up .js-image-frame',
- );
- replacedImageDiff.imageFrameEls[viewTypes.SWIPE] = element.querySelector(
- '.swipe .js-image-frame',
- );
+ replacedImageDiff.imageFrameEls[viewTypes.TWO_UP] =
+ element.querySelector('.two-up .js-image-frame');
+ replacedImageDiff.imageFrameEls[viewTypes.SWIPE] =
+ element.querySelector('.swipe .js-image-frame');
replacedImageDiff.imageFrameEls[viewTypes.ONION_SKIN] = element.querySelector(
'.onion-skin .js-image-frame',
);
@@ -59,9 +57,8 @@ describe('ReplacedImageDiff', () => {
replacedImageDiff.viewModesEls[viewTypes.TWO_UP] = element.querySelector(
'.view-modes-menu .two-up',
);
- replacedImageDiff.viewModesEls[viewTypes.SWIPE] = element.querySelector(
- '.view-modes-menu .swipe',
- );
+ replacedImageDiff.viewModesEls[viewTypes.SWIPE] =
+ element.querySelector('.view-modes-menu .swipe');
replacedImageDiff.viewModesEls[viewTypes.ONION_SKIN] = element.querySelector(
'.view-modes-menu .onion-skin',
);
diff --git a/spec/frontend/invite_members/components/invite_modal_base_spec.js b/spec/frontend/invite_members/components/invite_modal_base_spec.js
index 4f4288196ab..84ef4e7623d 100644
--- a/spec/frontend/invite_members/components/invite_modal_base_spec.js
+++ b/spec/frontend/invite_members/components/invite_modal_base_spec.js
@@ -236,7 +236,8 @@ describe('InviteModalBase', () => {
});
describe('when users limit is not reached', () => {
- const textRegex = /Select a role\s*Read more about role permissions\s*Access expiration date \(optional\)/;
+ const textRegex =
+ /Select a role\s*Read more about role permissions\s*Access expiration date \(optional\)/;
beforeEach(() => {
createComponent({ props: { reachedLimit: false }, stubs: { GlModal, GlFormGroup } });
diff --git a/spec/frontend/issues/show/components/description_spec.js b/spec/frontend/issues/show/components/description_spec.js
index 1fe853677c5..effc4043144 100644
--- a/spec/frontend/issues/show/components/description_spec.js
+++ b/spec/frontend/issues/show/components/description_spec.js
@@ -284,9 +284,10 @@ describe('Description component', () => {
});
it('calls a mutation to create a task', () => {
- const workItemTypeIdForTask = projectWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes.find(
- (node) => node.name === 'Task',
- ).id;
+ const workItemTypeIdForTask =
+ projectWorkItemTypesQueryResponse.data.workspace.workItemTypes.nodes.find(
+ (node) => node.name === 'Task',
+ ).id;
const { confidential, iteration, milestone } = issueDetailsResponse.data.issue;
expect(createWorkItemMutationHandler).toHaveBeenCalledWith({
input: {
diff --git a/spec/frontend/lib/apollo/persistence_mapper_spec.js b/spec/frontend/lib/apollo/persistence_mapper_spec.js
index 2efe28d2ca7..22809aa1c83 100644
--- a/spec/frontend/lib/apollo/persistence_mapper_spec.js
+++ b/spec/frontend/lib/apollo/persistence_mapper_spec.js
@@ -39,81 +39,82 @@ describe('lib/apollo/persistence_mapper', () => {
'Project:gid://gitlab/Project/6': {
__typename: 'Project',
id: 'gid://gitlab/Project/6',
- 'issues({"after":null,"before":"eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0wOSAwNDowNToyOS4yMzI5NDUwMDAgKzAwMDAiLCJpZCI6IjE1NjYifQ","includeSubepics":true,"last":20,"sort":"UPDATED_DESC","state":"opened","types":["ISSUE","INCIDENT","TEST_CASE","TASK"]})': {
- __typename: 'IssueConnection',
- __persist: true,
- pageInfo: {
- __typename: 'PageInfo',
- hasNextPage: true,
- hasPreviousPage: false,
- startCursor:
- 'eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0xMCAxMjozNjo1NC41NDYxNzEwMDAgKzAwMDAiLCJpZCI6IjQ4MyJ9',
- endCursor:
- 'eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0wOSAwNDowNToyOS4zMDE3NDcwMDAgKzAwMDAiLCJpZCI6IjE1NjcifQ',
+ 'issues({"after":null,"before":"eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0wOSAwNDowNToyOS4yMzI5NDUwMDAgKzAwMDAiLCJpZCI6IjE1NjYifQ","includeSubepics":true,"last":20,"sort":"UPDATED_DESC","state":"opened","types":["ISSUE","INCIDENT","TEST_CASE","TASK"]})':
+ {
+ __typename: 'IssueConnection',
+ __persist: true,
+ pageInfo: {
+ __typename: 'PageInfo',
+ hasNextPage: true,
+ hasPreviousPage: false,
+ startCursor:
+ 'eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0xMCAxMjozNjo1NC41NDYxNzEwMDAgKzAwMDAiLCJpZCI6IjQ4MyJ9',
+ endCursor:
+ 'eyJ1cGRhdGVkX2F0IjoiMjAyMy0wMS0wOSAwNDowNToyOS4zMDE3NDcwMDAgKzAwMDAiLCJpZCI6IjE1NjcifQ',
+ },
+ nodes: [
+ {
+ __ref: 'Issue:gid://gitlab/Issue/483',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1585',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1584',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1583',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1582',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1581',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1580',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1579',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1578',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1577',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1576',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1575',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1574',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1573',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1572',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1571',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1570',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1569',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1568',
+ },
+ {
+ __ref: 'Issue:gid://gitlab/Issue/1567',
+ },
+ ],
},
- nodes: [
- {
- __ref: 'Issue:gid://gitlab/Issue/483',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1585',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1584',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1583',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1582',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1581',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1580',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1579',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1578',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1577',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1576',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1575',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1574',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1573',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1572',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1571',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1570',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1569',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1568',
- },
- {
- __ref: 'Issue:gid://gitlab/Issue/1567',
- },
- ],
- },
},
'Issue:gid://gitlab/Issue/483': {
__typename: 'Issue',
diff --git a/spec/frontend/notes/components/discussion_actions_spec.js b/spec/frontend/notes/components/discussion_actions_spec.js
index 652b6643084..2bbf4203e45 100644
--- a/spec/frontend/notes/components/discussion_actions_spec.js
+++ b/spec/frontend/notes/components/discussion_actions_spec.js
@@ -20,23 +20,25 @@ const createUnallowedNote = () =>
describe('DiscussionActions', () => {
let wrapper;
- const createComponentFactory = (shallow = true) => (props, options) => {
- const store = createStore();
- const mountFn = shallow ? shallowMount : mount;
+ const createComponentFactory =
+ (shallow = true) =>
+ (props, options) => {
+ const store = createStore();
+ const mountFn = shallow ? shallowMount : mount;
- wrapper = mountFn(DiscussionActions, {
- store,
- propsData: {
- discussion: discussionMock,
- isResolving: false,
- resolveButtonTitle: 'Resolve discussion',
- resolveWithIssuePath: '/some/issue/path',
- shouldShowJumpToNextDiscussion: true,
- ...props,
- },
- ...options,
- });
- };
+ wrapper = mountFn(DiscussionActions, {
+ store,
+ propsData: {
+ discussion: discussionMock,
+ isResolving: false,
+ resolveButtonTitle: 'Resolve discussion',
+ resolveWithIssuePath: '/some/issue/path',
+ shouldShowJumpToNextDiscussion: true,
+ ...props,
+ },
+ ...options,
+ });
+ };
describe('rendering', () => {
const createComponent = createComponentFactory();
diff --git a/spec/frontend/notes/mock_data.js b/spec/frontend/notes/mock_data.js
index e254ed9b372..e1e17e61548 100644
--- a/spec/frontend/notes/mock_data.js
+++ b/spec/frontend/notes/mock_data.js
@@ -695,8 +695,7 @@ export const notesWithDescriptionChanges = [
noteable_type: 'Issue',
resolvable: false,
noteable_iid: 12,
- note:
- 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+ note: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
note_html:
'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
', current_user: { can_edit: true, can_award_emoji: true }, @@ -742,8 +741,7 @@ export const notesWithDescriptionChanges = [ noteable_type: 'Issue', resolvable: false, noteable_iid: 12, - note: - 'Varius vel pharetra vel turpis nunc eget lorem. Ipsum dolor sit amet consectetur adipiscing.', + note: 'Varius vel pharetra vel turpis nunc eget lorem. Ipsum dolor sit amet consectetur adipiscing.', note_html: 'Varius vel pharetra vel turpis nunc eget lorem. Ipsum dolor sit amet consectetur adipiscing.
', current_user: { can_edit: true, can_award_emoji: true }, @@ -969,8 +967,7 @@ export const collapsedSystemNotes = [ noteable_type: 'Issue', resolvable: false, noteable_iid: 12, - note: - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.', + note: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.', note_html: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
', current_user: { can_edit: true, can_award_emoji: true }, @@ -1016,8 +1013,7 @@ export const collapsedSystemNotes = [ noteable_type: 'Issue', resolvable: false, noteable_iid: 12, - note: - 'Varius vel pharetra vel turpis nunc eget lorem. Ipsum dolor sit amet consectetur adipiscing.', + note: 'Varius vel pharetra vel turpis nunc eget lorem. Ipsum dolor sit amet consectetur adipiscing.', note_html: 'Varius vel pharetra vel turpis nunc eget lorem. Ipsum dolor sit amet consectetur adipiscing.
', current_user: { can_edit: true, can_award_emoji: true }, diff --git a/spec/frontend/organizations/shared/components/groups_view_spec.js b/spec/frontend/organizations/shared/components/groups_view_spec.js index 2cb3b160357..79a1e6e78aa 100644 --- a/spec/frontend/organizations/shared/components/groups_view_spec.js +++ b/spec/frontend/organizations/shared/components/groups_view_spec.js @@ -1,6 +1,7 @@ import VueApollo from 'vue-apollo'; import Vue from 'vue'; import { GlLoadingIcon, GlKeysetPagination } from '@gitlab/ui'; +import MockAdapter from 'axios-mock-adapter'; import organizationGroupsGraphQlResponse from 'test_fixtures/graphql/organizations/groups.query.graphql.json'; import GroupsView from '~/organizations/shared/components/groups_view.vue'; import { SORT_DIRECTION_ASC, SORT_ITEM_NAME } from '~/organizations/shared/constants'; @@ -11,13 +12,13 @@ import { deleteParams, formatGroups, } from 'ee_else_ce/organizations/shared/utils'; -import { deleteGroup } from 'ee_else_ce/api/groups_api'; import groupsQuery from '~/organizations/shared/graphql/queries/groups.query.graphql'; import GroupsList from '~/vue_shared/components/groups_list/groups_list.vue'; import { TIMESTAMP_TYPE_CREATED_AT } from '~/vue_shared/components/resource_lists/constants'; import { ACTION_DELETE } from '~/vue_shared/components/list_actions/constants'; import { createAlert } from '~/alert'; import { DEFAULT_PER_PAGE } from '~/api'; +import axios from '~/lib/utils/axios_utils'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; @@ -52,10 +53,12 @@ Vue.use(VueApollo); describe('GroupsView', () => { let wrapper; let mockApollo; + let mockAxios; const defaultProvide = { groupsEmptyStateSvgPath: 'illustrations/empty-state/empty-groups-md.svg', newGroupPath: '/groups/new', + groupsPath: '/-/organizations/default/groups', organizationGid: 'gid://gitlab/Organizations::Organization/1', }; @@ -82,6 +85,7 @@ describe('GroupsView', () => { const createComponent = ({ handler = successHandler, propsData = {} } = {}) => { mockApollo = createMockApollo([[groupsQuery, handler]]); + mockAxios = new MockAdapter(axios); wrapper = shallowMountExtended(GroupsView, { apolloProvider: mockApollo, @@ -103,6 +107,7 @@ describe('GroupsView', () => { afterEach(() => { mockApollo = null; + mockAxios.restore(); }); describe('when API call is loading', () => { @@ -328,23 +333,25 @@ describe('GroupsView', () => { describe('when API call is successful', () => { beforeEach(async () => { - deleteGroup.mockResolvedValueOnce(Promise.resolve()); - createComponent(); + mockAxios.onDelete(defaultProvide.groupsPath).reply(200, {}); await waitForPromises(); }); it('calls deleteGroup, properly sets loading state, and refetches list when promise resolves', async () => { findGroupsList().vm.$emit('delete', MOCK_GROUP); - expect(deleteParams).toHaveBeenCalledWith(MOCK_GROUP); - expect(deleteGroup).toHaveBeenCalledWith(MOCK_GROUP.id, MOCK_DELETE_PARAMS); expect(findGroupsListByGroupId(MOCK_GROUP.id).actionLoadingStates[ACTION_DELETE]).toBe( true, ); await waitForPromises(); + expect(deleteParams).toHaveBeenCalledWith(MOCK_GROUP); + expect(mockAxios.history.delete[0].params).toEqual({ + id: MOCK_GROUP.fullPath, + ...MOCK_DELETE_PARAMS, + }); expect(findGroupsListByGroupId(MOCK_GROUP.id).actionLoadingStates[ACTION_DELETE]).toBe( false, @@ -369,12 +376,9 @@ describe('GroupsView', () => { }); describe('when API call is not successful', () => { - const error = new Error(); - beforeEach(async () => { - deleteGroup.mockRejectedValue(error); - createComponent(); + mockAxios.onDelete(defaultProvide.groupsPath).networkError(); await waitForPromises(); }); @@ -382,13 +386,16 @@ describe('GroupsView', () => { it('calls deleteGroup, properly sets loading state, and shows error alert', async () => { findGroupsList().vm.$emit('delete', MOCK_GROUP); - expect(deleteParams).toHaveBeenCalledWith(MOCK_GROUP); - expect(deleteGroup).toHaveBeenCalledWith(MOCK_GROUP.id, MOCK_DELETE_PARAMS); expect(findGroupsListByGroupId(MOCK_GROUP.id).actionLoadingStates[ACTION_DELETE]).toBe( true, ); await waitForPromises(); + expect(deleteParams).toHaveBeenCalledWith(MOCK_GROUP); + expect(mockAxios.history.delete[0].params).toEqual({ + id: MOCK_GROUP.fullPath, + ...MOCK_DELETE_PARAMS, + }); expect(findGroupsListByGroupId(MOCK_GROUP.id).actionLoadingStates[ACTION_DELETE]).toBe( false, @@ -398,7 +405,7 @@ describe('GroupsView', () => { expect(successHandler).toHaveBeenCalledTimes(1); expect(createAlert).toHaveBeenCalledWith({ message: 'An error occurred deleting the group. Please refresh the page to try again.', - error, + error: new Error('Network Error'), captureError: true, }); }); diff --git a/spec/frontend/packages_and_registries/dependency_proxy/app_spec.js b/spec/frontend/packages_and_registries/dependency_proxy/app_spec.js index dd70fca9dd2..f4f6d8d10aa 100644 --- a/spec/frontend/packages_and_registries/dependency_proxy/app_spec.js +++ b/spec/frontend/packages_and_registries/dependency_proxy/app_spec.js @@ -280,9 +280,8 @@ describe('DependencyProxyApp', () => { it('shows the clear cache dropdown list', () => { expect(findClearCacheDropdownList().exists()).toBe(true); - const clearCacheDropdownItem = findClearCacheDropdownList().findComponent( - GlDisclosureDropdownItem, - ); + const clearCacheDropdownItem = + findClearCacheDropdownList().findComponent(GlDisclosureDropdownItem); expect(clearCacheDropdownItem.text()).toBe('Clear cache'); }); diff --git a/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js b/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js index e2cace0e1ac..91b225df779 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/package_settings_spec.js @@ -292,10 +292,8 @@ describe('Packages Settings', () => { it('renders ExceptionsInput and assigns duplication allowness and exception props', () => { mountComponent({ mountFn: mountExtended }); - const { - terraformModuleDuplicatesAllowed, - terraformModuleDuplicateExceptionRegex, - } = packageSettings; + const { terraformModuleDuplicatesAllowed, terraformModuleDuplicateExceptionRegex } = + packageSettings; expect(findTerraformModuleDuplicatedSettingsExceptionsInput().props()).toMatchObject({ duplicatesAllowed: terraformModuleDuplicatesAllowed, diff --git a/spec/frontend/packages_and_registries/settings/project/settings/components/container_protection_rule_form_spec.js b/spec/frontend/packages_and_registries/settings/project/settings/components/container_protection_rule_form_spec.js index babe7308eda..02345ea2bd0 100644 --- a/spec/frontend/packages_and_registries/settings/project/settings/components/container_protection_rule_form_spec.js +++ b/spec/frontend/packages_and_registries/settings/project/settings/components/container_protection_rule_form_spec.js @@ -198,8 +198,9 @@ describe('container Protection Rule Form', () => { await submitForm(); expect(wrapper.emitted('submit')).toBeDefined(); - const expectedEventSubmitPayload = createContainerProtectionRuleMutationPayload().data - .createContainerRegistryProtectionRule.containerRegistryProtectionRule; + const expectedEventSubmitPayload = + createContainerProtectionRuleMutationPayload().data.createContainerRegistryProtectionRule + .containerRegistryProtectionRule; expect(wrapper.emitted('submit')[0]).toEqual([expectedEventSubmitPayload]); expect(wrapper.emitted()).not.toHaveProperty('cancel'); diff --git a/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rule_form_spec.js b/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rule_form_spec.js index 9c34f3d31e9..e5ddef1ef24 100644 --- a/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rule_form_spec.js +++ b/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rule_form_spec.js @@ -184,8 +184,9 @@ describe('Packages Protection Rule Form', () => { await submitForm(); expect(wrapper.emitted('submit')).toBeDefined(); - const expectedEventSubmitPayload = createPackagesProtectionRuleMutationPayload().data - .createPackagesProtectionRule.packageProtectionRule; + const expectedEventSubmitPayload = + createPackagesProtectionRuleMutationPayload().data.createPackagesProtectionRule + .packageProtectionRule; expect(wrapper.emitted('submit')[0]).toEqual([expectedEventSubmitPayload]); expect(wrapper.emitted()).not.toHaveProperty('cancel'); diff --git a/spec/frontend/pages/projects/forks/new/components/fork_form_spec.js b/spec/frontend/pages/projects/forks/new/components/fork_form_spec.js index 1551b05394b..04c2377ce84 100644 --- a/spec/frontend/pages/projects/forks/new/components/fork_form_spec.js +++ b/spec/frontend/pages/projects/forks/new/components/fork_form_spec.js @@ -54,61 +54,63 @@ describe('ForkForm component', () => { Vue.use(VueApollo); - const createComponentFactory = (mountFn) => (provide = {}, data = {}) => { - const queryResponse = { - project: { - id: 'gid://gitlab/Project/1', - forkTargets: { - nodes: [ - { - id: 'gid://gitlab/Group/21', - fullPath: 'flightjs', - name: 'Flight JS', - visibility: 'public', - }, - { - id: 'gid://gitlab/Namespace/4', - fullPath: 'root', - name: 'Administrator', - visibility: 'public', - }, - ], + const createComponentFactory = + (mountFn) => + (provide = {}, data = {}) => { + const queryResponse = { + project: { + id: 'gid://gitlab/Project/1', + forkTargets: { + nodes: [ + { + id: 'gid://gitlab/Group/21', + fullPath: 'flightjs', + name: 'Flight JS', + visibility: 'public', + }, + { + id: 'gid://gitlab/Namespace/4', + fullPath: 'root', + name: 'Administrator', + visibility: 'public', + }, + ], + }, }, - }, + }; + + mockQueryResponse = jest.fn().mockResolvedValue({ data: queryResponse }); + const requestHandlers = [[searchQuery, mockQueryResponse]]; + const apolloProvider = createMockApollo(requestHandlers); + + apolloProvider.clients.defaultClient.cache.writeQuery({ + query: searchQuery, + data: { + ...queryResponse, + }, + }); + + wrapper = mountFn(ForkForm, { + apolloProvider, + provide: { + ...DEFAULT_PROVIDE, + ...provide, + }, + data() { + return { + ...data, + }; + }, + stubs: { + GlFormInputGroup, + GlFormInput, + GlFormRadioGroup, + GlFormRadio, + GlSprintf, + }, + }); }; - mockQueryResponse = jest.fn().mockResolvedValue({ data: queryResponse }); - const requestHandlers = [[searchQuery, mockQueryResponse]]; - const apolloProvider = createMockApollo(requestHandlers); - - apolloProvider.clients.defaultClient.cache.writeQuery({ - query: searchQuery, - data: { - ...queryResponse, - }, - }); - - wrapper = mountFn(ForkForm, { - apolloProvider, - provide: { - ...DEFAULT_PROVIDE, - ...provide, - }, - data() { - return { - ...data, - }; - }, - stubs: { - GlFormInputGroup, - GlFormInput, - GlFormRadioGroup, - GlFormRadio, - GlSprintf, - }, - }); - }; - const createComponent = createComponentFactory(shallowMount); const createFullComponent = createComponentFactory(mount); @@ -546,13 +548,8 @@ describe('ForkForm component', () => { setupComponent(); await submitForm(); - const { - projectId, - projectDescription, - projectName, - projectPath, - projectVisibility, - } = DEFAULT_PROVIDE; + const { projectId, projectDescription, projectName, projectPath, projectVisibility } = + DEFAULT_PROVIDE; const url = `/api/${GON_API_VERSION}/projects/${projectId}/fork`; const project = { diff --git a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js index 3e5f1e0c228..404942b10a4 100644 --- a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js +++ b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js @@ -556,7 +556,8 @@ describe('Settings Panel', () => { await findPackageRegistryEnabledInput().vm.$emit('change', packageRegistryEnabled); - const packageRegistryApiForEveryoneEnabledInput = findPackageRegistryApiForEveryoneEnabledInput(); + const packageRegistryApiForEveryoneEnabledInput = + findPackageRegistryApiForEveryoneEnabledInput(); if (packageRegistryApiForEveryoneEnabled === 'hidden') { expect(packageRegistryApiForEveryoneEnabledInput.exists()).toBe(false); diff --git a/spec/frontend/projects/pipelines/charts/mock_data.js b/spec/frontend/projects/pipelines/charts/mock_data.js index 0e3e43835d0..26de7389522 100644 --- a/spec/frontend/projects/pipelines/charts/mock_data.js +++ b/spec/frontend/projects/pipelines/charts/mock_data.js @@ -119,69 +119,11 @@ export const mockPipelineStatistics = { '01 December', ], monthPipelinesTotals: [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ], monthPipelinesSuccessful: [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ], yearPipelinesLabels: [ @@ -234,36 +176,7 @@ export const mockPipelineStatistics = { '02d95fb2', ], pipelineTimesValues: [ - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 2, - 1, - 0, - 1, - 2, - 2, - 0, - 4, - 2, - 1, - 2, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 5, - 2, - 0, - 0, - 0, + 1, 0, 0, 0, 0, 1, 1, 2, 1, 0, 1, 2, 2, 0, 4, 2, 1, 2, 1, 1, 0, 1, 1, 0, 1, 5, 2, 0, 0, 0, ], __typename: 'Analytics', }, diff --git a/spec/frontend/projects/settings/branch_rules/components/view/index_spec.js b/spec/frontend/projects/settings/branch_rules/components/view/index_spec.js index 83bb22a1fb7..ccc2c0c4042 100644 --- a/spec/frontend/projects/settings/branch_rules/components/view/index_spec.js +++ b/spec/frontend/projects/settings/branch_rules/components/view/index_spec.js @@ -205,7 +205,8 @@ describe('View branch rules', () => { 'renders force push section with the correct title and description', async ({ allowForcePush, iconTitle, description }) => { const mockResponse = branchProtectionsMockResponse; - mockResponse.data.project.branchRules.nodes[0].branchProtection.allowForcePush = allowForcePush; + mockResponse.data.project.branchRules.nodes[0].branchProtection.allowForcePush = + allowForcePush; await createComponent({ glFeatures: { editBranchRules: true }, branchRulesQueryHandler: jest.fn().mockResolvedValue(mockResponse), @@ -461,7 +462,8 @@ describe('View branch rules', () => { 'renders force push section with the correct title and description, when rule is `$allowForcePush`', async ({ allowForcePush, title, description }) => { const mockResponse = branchProtectionsMockResponse; - mockResponse.data.project.branchRules.nodes[0].branchProtection.allowForcePush = allowForcePush; + mockResponse.data.project.branchRules.nodes[0].branchProtection.allowForcePush = + allowForcePush; await createComponent({ glFeatures: { editBranchRules: false }, diff --git a/spec/frontend/repository/components/delete_blob_modal_spec.js b/spec/frontend/repository/components/delete_blob_modal_spec.js index e1723a091c4..d3af39425db 100644 --- a/spec/frontend/repository/components/delete_blob_modal_spec.js +++ b/spec/frontend/repository/components/delete_blob_modal_spec.js @@ -25,22 +25,24 @@ const { i18n } = DeleteBlobModal; describe('DeleteBlobModal', () => { let wrapper; - const createComponentFactory = (mountFn) => (props = {}) => { - wrapper = mountFn(DeleteBlobModal, { - propsData: { - ...initialProps, - ...props, - }, - attrs: { - static: true, - visible: true, - }, - stubs: { - GlSprintf, - GlModal: stubComponent(GlModal, { template: RENDER_ALL_SLOTS_TEMPLATE }), - }, - }); - }; + const createComponentFactory = + (mountFn) => + (props = {}) => { + wrapper = mountFn(DeleteBlobModal, { + propsData: { + ...initialProps, + ...props, + }, + attrs: { + static: true, + visible: true, + }, + stubs: { + GlSprintf, + GlModal: stubComponent(GlModal, { template: RENDER_ALL_SLOTS_TEMPLATE }), + }, + }); + }; const createComponent = createComponentFactory(shallowMountExtended); const createFullComponent = createComponentFactory(mount); diff --git a/spec/frontend/repository/components/new_directory_modal_spec.js b/spec/frontend/repository/components/new_directory_modal_spec.js index 55a24089d48..eed8cc5599a 100644 --- a/spec/frontend/repository/components/new_directory_modal_spec.js +++ b/spec/frontend/repository/components/new_directory_modal_spec.js @@ -138,13 +138,8 @@ describe('NewDirectoryModal', () => { }); it('passes the formData', async () => { - const { - dirName, - branchName, - commitMessage, - originalBranch, - createNewMr, - } = defaultFormValue; + const { dirName, branchName, commitMessage, originalBranch, createNewMr } = + defaultFormValue; mock.onPost(initialProps.path).reply(HTTP_STATUS_OK, {}); await fillForm(); await submitForm(); diff --git a/spec/frontend/repository/components/tree_content_spec.js b/spec/frontend/repository/components/tree_content_spec.js index 311e5ca86f8..5b396152fb9 100644 --- a/spec/frontend/repository/components/tree_content_spec.js +++ b/spec/frontend/repository/components/tree_content_spec.js @@ -82,9 +82,8 @@ describe('Repository table component', () => { await nextTick(); await waitForPromises(); - const [ - paginatedTreeNode, - ] = paginatedTreeResponseFactory().data.project.repository.paginatedTree.nodes; + const [paginatedTreeNode] = + paginatedTreeResponseFactory().data.project.repository.paginatedTree.nodes; const { blobs: { nodes: blobs }, diff --git a/spec/frontend/repository/mock_data.js b/spec/frontend/repository/mock_data.js index c60b6ace598..a5d374c234e 100644 --- a/spec/frontend/repository/mock_data.js +++ b/spec/frontend/repository/mock_data.js @@ -152,8 +152,7 @@ export const paginatedTreeResponseFactory = ({ __typename: 'TreeEntryConnection', nodes: new Array(numberOfTrees).fill({ __typename: 'TreeEntry', - id: - 'gid://gitlab/Gitlab::Graphql::Representation::TreeEntry/dc36320ac91aca2f890a31458c9e9920159e68a3', + id: 'gid://gitlab/Gitlab::Graphql::Representation::TreeEntry/dc36320ac91aca2f890a31458c9e9920159e68a3', sha: 'dc36320ac91aca2f890a31458c9e9920159e68ae', name: 'gitlab-resize-image', flatPath: 'workhorse/cmd/gitlab-resize-image', @@ -169,8 +168,7 @@ export const paginatedTreeResponseFactory = ({ __typename: 'BlobConnection', nodes: new Array(numberOfBlobs).fill({ __typename: 'Blob', - id: - 'gid://gitlab/Gitlab::Graphql::Representation::TreeEntry/99712dbc6b26ff92c15bf93449ea09df38adfb10', + id: 'gid://gitlab/Gitlab::Graphql::Representation::TreeEntry/99712dbc6b26ff92c15bf93449ea09df38adfb10', sha: '99712dbc6b26ff92c15bf93449ea09df38adfb1b', name: blobHasReadme ? 'README.md' : 'fakeBlob', flatPath: blobHasReadme ? 'README.md' : 'fakeBlob', diff --git a/spec/frontend/usage_quotas/storage/components/namespace_storage_app_spec.js b/spec/frontend/usage_quotas/storage/components/namespace_storage_app_spec.js index a3c649debf0..6a7ea636491 100644 --- a/spec/frontend/usage_quotas/storage/components/namespace_storage_app_spec.js +++ b/spec/frontend/usage_quotas/storage/components/namespace_storage_app_spec.js @@ -112,10 +112,8 @@ describe('NamespaceStorageApp', () => { }); it('will receive relevant props', () => { - const { - containerRegistrySize, - containerRegistrySizeIsEstimated, - } = namespace.rootStorageStatistics; + const { containerRegistrySize, containerRegistrySizeIsEstimated } = + namespace.rootStorageStatistics; expect(findContainerRegistry().props()).toEqual({ containerRegistrySize, diff --git a/spec/frontend/usage_quotas/storage/project/utils_spec.js b/spec/frontend/usage_quotas/storage/project/utils_spec.js index cabe42833e1..b542a89c718 100644 --- a/spec/frontend/usage_quotas/storage/project/utils_spec.js +++ b/spec/frontend/usage_quotas/storage/project/utils_spec.js @@ -6,10 +6,8 @@ import { import { mockGetProjectStorageStatisticsGraphQLResponse } from 'jest/usage_quotas/storage/mock_data'; describe('getStorageTypesFromProjectStatistics', () => { - const { - statistics: projectStatistics, - statisticsDetailsPaths, - } = mockGetProjectStorageStatisticsGraphQLResponse.data.project; + const { statistics: projectStatistics, statisticsDetailsPaths } = + mockGetProjectStorageStatisticsGraphQLResponse.data.project; describe('matches project statistics value with matching storage type', () => { const typesWithStats = getStorageTypesFromProjectStatistics( diff --git a/spec/frontend/vue_merge_request_widget/extensions/security_reports/mr_widget_security_reports_spec.js b/spec/frontend/vue_merge_request_widget/extensions/security_reports/mr_widget_security_reports_spec.js index a59016d7995..5fd9b92aad4 100644 --- a/spec/frontend/vue_merge_request_widget/extensions/security_reports/mr_widget_security_reports_spec.js +++ b/spec/frontend/vue_merge_request_widget/extensions/security_reports/mr_widget_security_reports_spec.js @@ -46,8 +46,7 @@ describe('vue_merge_request_widget/extensions/security_reports/mr_widget_securit content: { learnMorePath: '/help/user/application_security/index#view-security-scan-information-in-merge-requests', - text: - 'New vulnerabilities are vulnerabilities that the security scan detects in the merge request that are different to existing vulnerabilities in the default branch.', + text: 'New vulnerabilities are vulnerabilities that the security scan detects in the merge request that are different to existing vulnerabilities in the default branch.', }, options: { title: 'Security scan results', diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/base_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/base_token_spec.js index f68619d7c6f..98c149f43df 100644 --- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/base_token_spec.js +++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/base_token_spec.js @@ -359,8 +359,9 @@ describe('BaseToken', () => { it(`${ shouldRenderFilteredSearchSuggestion ? 'should' : 'should not' } render GlFilteredSearchSuggestion`, () => { - const filteredSearchSuggestions = wrapper.findAllComponents(GlFilteredSearchSuggestion) - .wrappers; + const filteredSearchSuggestions = wrapper.findAllComponents( + GlFilteredSearchSuggestion, + ).wrappers; if (shouldRenderFilteredSearchSuggestion) { expect(filteredSearchSuggestions.map((c) => c.props())).toMatchObject( diff --git a/spec/frontend/vue_shared/components/user_callout_dismisser_spec.js b/spec/frontend/vue_shared/components/user_callout_dismisser_spec.js index a4efbda06ce..fc6d0ab1c4e 100644 --- a/spec/frontend/vue_shared/components/user_callout_dismisser_spec.js +++ b/spec/frontend/vue_shared/components/user_callout_dismisser_spec.js @@ -31,8 +31,10 @@ describe('UserCalloutDismisser', () => { const MOCK_FEATURE_NAME = 'mock_feature_name'; // Query handlers - const successHandlerFactory = (dismissedCallouts = []) => () => - Promise.resolve(userCalloutsResponse(dismissedCallouts)); + const successHandlerFactory = + (dismissedCallouts = []) => + () => + Promise.resolve(userCalloutsResponse(dismissedCallouts)); const anonUserHandler = () => Promise.resolve(anonUserCalloutsResponse()); const errorHandler = () => Promise.reject(new Error('query error')); const pendingHandler = () => new Promise(() => {}); diff --git a/spec/frontend/vue_shared/security_reports/components/apollo_mocks.js b/spec/frontend/vue_shared/security_reports/components/apollo_mocks.js index 066f9a57bc6..79909c2c98a 100644 --- a/spec/frontend/vue_shared/security_reports/components/apollo_mocks.js +++ b/spec/frontend/vue_shared/security_reports/components/apollo_mocks.js @@ -1,12 +1,11 @@ -export const buildConfigureSecurityFeatureMockFactory = (mutationType) => ({ - successPath = 'testSuccessPath', - errors = [], -} = {}) => ({ - data: { - [mutationType]: { - successPath, - errors, - __typename: `${mutationType}Payload`, +export const buildConfigureSecurityFeatureMockFactory = + (mutationType) => + ({ successPath = 'testSuccessPath', errors = [] } = {}) => ({ + data: { + [mutationType]: { + successPath, + errors, + __typename: `${mutationType}Payload`, + }, }, - }, -}); + }); diff --git a/spec/frontend/vue_shared/security_reports/components/manage_via_mr_spec.js b/spec/frontend/vue_shared/security_reports/components/manage_via_mr_spec.js index 7b660ccabfc..91a629c4504 100644 --- a/spec/frontend/vue_shared/security_reports/components/manage_via_mr_spec.js +++ b/spec/frontend/vue_shared/security_reports/components/manage_via_mr_spec.js @@ -76,9 +76,8 @@ describe('ManageViaMr component', () => { describe.each(supportedReportTypes)( '%s', (featureName, featureType, mutation, mutationId, mutationVariables) => { - const buildConfigureSecurityFeatureMock = buildConfigureSecurityFeatureMockFactory( - mutationId, - ); + const buildConfigureSecurityFeatureMock = + buildConfigureSecurityFeatureMockFactory(mutationId); const successHandler = jest.fn().mockResolvedValue(buildConfigureSecurityFeatureMock()); const noSuccessPathHandler = jest.fn().mockResolvedValue( buildConfigureSecurityFeatureMock({ diff --git a/spec/frontend/work_items/components/notes/work_item_discussion_spec.js b/spec/frontend/work_items/components/notes/work_item_discussion_spec.js index 609e19f146d..4f4ffe7bb1c 100644 --- a/spec/frontend/work_items/components/notes/work_item_discussion_spec.js +++ b/spec/frontend/work_items/components/notes/work_item_discussion_spec.js @@ -11,9 +11,10 @@ import { } from 'jest/work_items/mock_data'; import { WIDGET_TYPE_NOTES } from '~/work_items/constants'; -const mockWorkItemNotesWidgetResponseWithComments = mockWorkItemNotesResponseWithComments.data.workspace.workItem.widgets.find( - (widget) => widget.type === WIDGET_TYPE_NOTES, -); +const mockWorkItemNotesWidgetResponseWithComments = + mockWorkItemNotesResponseWithComments.data.workspace.workItem.widgets.find( + (widget) => widget.type === WIDGET_TYPE_NOTES, + ); describe('Work Item Discussion', () => { let wrapper; diff --git a/spec/frontend/work_items/components/work_item_assignees_spec.js b/spec/frontend/work_items/components/work_item_assignees_spec.js index cba431d6912..ef5458e0024 100644 --- a/spec/frontend/work_items/components/work_item_assignees_spec.js +++ b/spec/frontend/work_items/components/work_item_assignees_spec.js @@ -269,10 +269,8 @@ describe('WorkItemAssignees component', () => { }); it('sorts selected assignees first', async () => { - const [ - unselected, - selected, - ] = projectMembersAutocompleteResponseWithCurrentUser.data.workspace.users; + const [unselected, selected] = + projectMembersAutocompleteResponseWithCurrentUser.data.workspace.users; createComponent({ assignees: [selected], diff --git a/spec/frontend/work_items/components/work_item_notes_spec.js b/spec/frontend/work_items/components/work_item_notes_spec.js index 8c1477142fc..639866e0be9 100644 --- a/spec/frontend/work_items/components/work_item_notes_spec.js +++ b/spec/frontend/work_items/components/work_item_notes_spec.js @@ -36,13 +36,15 @@ const mockNotesWidgetResponse = mockWorkItemNotesResponse.data.workItem.widgets. (widget) => widget.type === WIDGET_TYPE_NOTES, ); -const mockMoreNotesWidgetResponse = mockMoreWorkItemNotesResponse.data.workspace.workItem.widgets.find( - (widget) => widget.type === WIDGET_TYPE_NOTES, -); +const mockMoreNotesWidgetResponse = + mockMoreWorkItemNotesResponse.data.workspace.workItem.widgets.find( + (widget) => widget.type === WIDGET_TYPE_NOTES, + ); -const mockWorkItemNotesWidgetResponseWithComments = mockWorkItemNotesResponseWithComments.data.workspace.workItem.widgets.find( - (widget) => widget.type === WIDGET_TYPE_NOTES, -); +const mockWorkItemNotesWidgetResponseWithComments = + mockWorkItemNotesResponseWithComments.data.workspace.workItem.widgets.find( + (widget) => widget.type === WIDGET_TYPE_NOTES, + ); const firstSystemNodeId = mockNotesWidgetResponse.discussions.nodes[0].notes.nodes[0].id; diff --git a/spec/frontend/work_items/mock_data.js b/spec/frontend/work_items/mock_data.js index 09907b5a16e..e561db31c61 100644 --- a/spec/frontend/work_items/mock_data.js +++ b/spec/frontend/work_items/mock_data.js @@ -2995,8 +2995,7 @@ export const mockWorkItemNotesByIidResponse = { nodes: [ { id: 'gid://gitlab/IterationNote/addbc177f7664699a135130ab05ffb78c57e4db3', - body: - 'changed iteration to Et autem debitis nam suscipit eos ut. Jul 13, 2022 - Jul 19, 2022', + body: 'changed iteration to Et autem debitis nam suscipit eos ut. Jul 13, 2022 - Jul 19, 2022', bodyHtml: '\u003cp data-sourcepos="1:1-1:36" dir="auto"\u003echanged iteration to \u003ca href="/groups/flightjs/-/iterations/5352" data-reference-type="iteration" data-original="*iteration:5352" data-link="false" data-link-reference="false" data-project="6" data-iteration="5352" data-container="body" data-placement="top" title="Iteration" class="gfm gfm-iteration has-tooltip"\u003eEt autem debitis nam suscipit eos ut. Jul 13, 2022 - Jul 19, 2022\u003c/a\u003e\u003c/p\u003e', systemNoteIconName: 'iteration', @@ -3941,8 +3940,7 @@ export const workItemNotesWithSystemNotesWithChangedDescription = { descriptionVersion: { id: 'gid://gitlab/DescriptionVersion/199', description: 'Desc2', - diff: - 'Desc12', + diff: 'Desc12', diffPath: '/gnuwget/Wget2/-/issues/79/descriptions/199/diff', deletePath: '/gnuwget/Wget2/-/issues/79/descriptions/199', canDelete: true, @@ -4007,8 +4005,7 @@ export const workItemNotesWithSystemNotesWithChangedDescription = { descriptionVersion: { id: 'gid://gitlab/DescriptionVersion/200', description: 'Desc3', - diff: - 'Desc23', + diff: 'Desc23', diffPath: '/gnuwget/Wget2/-/issues/79/descriptions/200/diff', deletePath: '/gnuwget/Wget2/-/issues/79/descriptions/200', canDelete: true, diff --git a/spec/frontend_integration/diffs/diffs_interopability_spec.js b/spec/frontend_integration/diffs/diffs_interopability_spec.js index 470419e9f87..57d8726cd02 100644 --- a/spec/frontend_integration/diffs/diffs_interopability_spec.js +++ b/spec/frontend_integration/diffs/diffs_interopability_spec.js @@ -98,13 +98,15 @@ describe('diffs third party interoperability', () => { document.body.innerHTML = ''; }); - const tryOrErrorMessage = (fn) => (...args) => { - try { - return fn(...args); - } catch (e) { - return e.message; - } - }; + const tryOrErrorMessage = + (fn) => + (...args) => { + try { + return fn(...args); + } catch (e) { + return e.message; + } + }; const findDiffFile = () => document.querySelector(`.diff-file[data-path="${TEST_DIFF_FILE}"]`); const hasLines = (sel = 'tr.line_holder') => findDiffFile().querySelectorAll(sel).length > 0; diff --git a/spec/frontend_integration/test_helpers/mock_server/routes/repository.js b/spec/frontend_integration/test_helpers/mock_server/routes/repository.js index ba36463cad8..42b8f893b03 100644 --- a/spec/frontend_integration/test_helpers/mock_server/routes/repository.js +++ b/spec/frontend_integration/test_helpers/mock_server/routes/repository.js @@ -32,9 +32,11 @@ export default (server) => { }); server.post('/api/v4/projects/:id/repository/commits', (schema, request) => { - const { branch: branchName, commit_message: message, actions } = JSON.parse( - request.requestBody, - ); + const { + branch: branchName, + commit_message: message, + actions, + } = JSON.parse(request.requestBody); const branch = schema.branches.findBy({ name: branchName }); const prevCommit = branch diff --git a/spec/frontend_integration/test_helpers/utils/obj_spec.js b/spec/frontend_integration/test_helpers/utils/obj_spec.js index 614250ccddc..0ad7b4a1a4c 100644 --- a/spec/frontend_integration/test_helpers/utils/obj_spec.js +++ b/spec/frontend_integration/test_helpers/utils/obj_spec.js @@ -3,9 +3,9 @@ import { withKeys, withValues } from './obj'; describe('frontend_integration/test_helpers/utils/obj', () => { describe('withKeys', () => { it('picks and maps keys', () => { - expect( - withKeys({ a: '123', b: 456, c: 'd' }, { b: 'lorem', c: 'ipsum', z: 'zed ' }), - ).toEqual({ lorem: 456, ipsum: 'd' }); + expect(withKeys({ a: '123', b: 456, c: 'd' }, { b: 'lorem', c: 'ipsum', z: 'zed ' })).toEqual( + { lorem: 456, ipsum: 'd' }, + ); }); }); diff --git a/spec/helpers/organizations/organization_helper_spec.rb b/spec/helpers/organizations/organization_helper_spec.rb index 0f218d0997e..96e05d1e184 100644 --- a/spec/helpers/organizations/organization_helper_spec.rb +++ b/spec/helpers/organizations/organization_helper_spec.rb @@ -6,8 +6,11 @@ RSpec.describe Organizations::OrganizationHelper, feature_category: :cell do include Devise::Test::ControllerHelpers let_it_be(:user) { build_stubbed(:user, organization_groups_projects_sort: 'name_asc') } - let_it_be(:organization_detail) { build_stubbed(:organization_detail, description_html: 'description') } - let_it_be(:organization) { organization_detail.organization } + let_it_be(:organization) { build_stubbed(:organization, :default) } + let_it_be(:organization_detail) do + build_stubbed(:organization_detail, organization: organization, description_html: 'description') + end + let_it_be(:organization_gid) { 'gid://gitlab/Organizations::Organization/1' } let_it_be(:new_group_path) { '/-/organizations/default/groups/new' } let_it_be(:new_project_path) { '/projects/new' } @@ -31,7 +34,6 @@ RSpec.describe Organizations::OrganizationHelper, feature_category: :cell do end before do - allow(organization).to receive(:to_global_id).and_return(organization_gid) allow(helper).to receive(:new_groups_organization_path).with(organization).and_return(new_group_path) allow(helper).to receive(:new_project_path).and_return(new_project_path) allow(helper).to receive(:image_path).with(organizations_empty_state_svg_path) @@ -46,9 +48,6 @@ RSpec.describe Organizations::OrganizationHelper, feature_category: :cell do allow(finder).to receive(:execute).and_return(stubbed_results) end allow(helper).to receive(:restricted_visibility_levels).and_return([]) - allow(helper).to receive(:groups_organization_path) - .with(organization) - .and_return(groups_organization_path) end shared_examples 'includes that the user can create a group' do |method| @@ -161,6 +160,7 @@ RSpec.describe Organizations::OrganizationHelper, feature_category: :cell do 'groups_and_projects_organization_path' => groups_and_projects_organization_path, 'users_organization_path' => users_organization_path, 'new_group_path' => new_group_path, + 'groups_path' => groups_organization_path, 'new_project_path' => new_project_path, 'groups_empty_state_svg_path' => groups_empty_state_svg_path, 'projects_empty_state_svg_path' => projects_empty_state_svg_path, @@ -206,6 +206,7 @@ RSpec.describe Organizations::OrganizationHelper, feature_category: :cell do { 'organization_gid' => organization_gid, 'new_group_path' => new_group_path, + 'groups_path' => groups_organization_path, 'new_project_path' => new_project_path, 'groups_empty_state_svg_path' => groups_empty_state_svg_path, 'projects_empty_state_svg_path' => projects_empty_state_svg_path, diff --git a/spec/requests/api/markdown_uploads_spec.rb b/spec/requests/api/markdown_uploads_spec.rb new file mode 100644 index 00000000000..b7262970347 --- /dev/null +++ b/spec/requests/api/markdown_uploads_spec.rb @@ -0,0 +1,78 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe API::MarkdownUploads, feature_category: :team_planning do + let_it_be(:project) { create(:project, :private) } + let_it_be(:user) { create(:user, guest_of: project) } + + describe "POST /projects/:id/uploads/authorize" do + include WorkhorseHelpers + + let(:headers) { workhorse_internal_api_request_header.merge({ 'HTTP_GITLAB_WORKHORSE' => 1 }) } + let(:path) { "/projects/#{project.id}/uploads/authorize" } + + context 'with authorized user' do + it "returns 200" do + post api(path, user), headers: headers + + expect(response).to have_gitlab_http_status(:ok) + expect(json_response['MaximumSize']).to eq(project.max_attachment_size) + end + end + + context 'with unauthorized user' do + it "returns 404" do + post api(path, create(:user)), headers: headers + + expect(response).to have_gitlab_http_status(:not_found) + end + end + + context 'with no Workhorse headers' do + it "returns 403" do + post api(path, user) + + expect(response).to have_gitlab_http_status(:forbidden) + end + end + end + + describe "POST /projects/:id/uploads" do + let(:file) { fixture_file_upload("spec/fixtures/dk.png", "image/png") } + let(:path) { "/projects/#{project.id}/uploads" } + + before do + project + end + + it "uploads the file and returns its info" do + post api(path, user), params: { file: file } + + expect(response).to have_gitlab_http_status(:created) + expect(json_response['alt']).to eq("dk") + expect(json_response['url']).to start_with("/uploads/") + expect(json_response['url']).to end_with("/dk.png") + expect(json_response['full_path']).to start_with("/-/project/#{project.id}/uploads") + end + + it "does not leave the temporary file in place after uploading, even when the tempfile reaper does not run" do + tempfile = Tempfile.new('foo') + path = tempfile.path + + # rubocop: disable RSpec/AnyInstanceOf -- allow_next_instance_of does not work here because TempfileReaper is a middleware that is initialized early + allow_any_instance_of(Rack::TempfileReaper).to receive(:call) do |instance, env| + instance.instance_variable_get(:@app).call(env) + end + # rubocop: enable RSpec/AnyInstanceOf + + expect(path).not_to be(nil) + expect(Rack::Multipart::Parser::TEMPFILE_FACTORY).to receive(:call).and_return(tempfile) + + post api(path, user), params: { file: fixture_file_upload("spec/fixtures/dk.png", "image/png") } + + expect(tempfile.path).to be(nil) + expect(File.exist?(path)).to be(false) + end + end +end diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 0a3934bc3b5..ff47129ff77 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -2279,119 +2279,6 @@ RSpec.describe API::Projects, :aggregate_failures, feature_category: :groups_and end end - describe "POST /projects/:id/uploads/authorize" do - let(:headers) { workhorse_internal_api_request_header.merge({ 'HTTP_GITLAB_WORKHORSE' => 1 }) } - let(:path) { "/projects/#{project.id}/uploads/authorize" } - - context 'with authorized user' do - it "returns 200" do - post api(path, user), headers: headers - - expect(response).to have_gitlab_http_status(:ok) - expect(json_response['MaximumSize']).to eq(project.max_attachment_size) - end - end - - context 'with unauthorized user' do - it "returns 404" do - post api(path, user2), headers: headers - - expect(response).to have_gitlab_http_status(:not_found) - end - end - - context 'with exempted project' do - before do - stub_env('GITLAB_UPLOAD_API_ALLOWLIST', project.id) - end - - it "returns 200" do - post api(path, user), headers: headers - - expect(response).to have_gitlab_http_status(:ok) - expect(json_response['MaximumSize']).to eq(1.gigabyte) - end - end - - context 'with no Workhorse headers' do - it "returns 403" do - post api(path, user) - - expect(response).to have_gitlab_http_status(:forbidden) - end - end - end - - describe "POST /projects/:id/uploads" do - let(:file) { fixture_file_upload("spec/fixtures/dk.png", "image/png") } - let(:path) { "/projects/#{project.id}/uploads" } - - before do - project - end - - it "uploads the file and returns its info" do - expect_next_instance_of(UploadService) do |instance| - expect(instance).to receive(:override_max_attachment_size=).with(project.max_attachment_size).and_call_original - end - - post api(path, user), params: { file: file } - - expect(response).to have_gitlab_http_status(:created) - expect(json_response['alt']).to eq("dk") - expect(json_response['url']).to start_with("/uploads/") - expect(json_response['url']).to end_with("/dk.png") - expect(json_response['full_path']).to start_with("/-/project/#{project.id}/uploads") - end - - it "does not leave the temporary file in place after uploading, even when the tempfile reaper does not run" do - tempfile = Tempfile.new('foo') - path = tempfile.path - - allow_any_instance_of(Rack::TempfileReaper).to receive(:call) do |instance, env| - instance.instance_variable_get(:@app).call(env) - end - - expect(path).not_to be(nil) - expect(Rack::Multipart::Parser::TEMPFILE_FACTORY).to receive(:call).and_return(tempfile) - - post api(path, user), params: { file: fixture_file_upload("spec/fixtures/dk.png", "image/png") } - - expect(tempfile.path).to be(nil) - expect(File.exist?(path)).to be(false) - end - - shared_examples 'capped upload attachments' do |upload_allowed| - it "limits the upload to 1 GiB" do - expect_next_instance_of(UploadService) do |instance| - expect(instance).to receive(:override_max_attachment_size=).with(1.gigabyte).and_call_original - end - - post api(path, user), params: { file: file } - - expect(response).to have_gitlab_http_status(:created) - end - - it "logs a warning if file exceeds attachment size" do - allow(Gitlab::CurrentSettings).to receive(:max_attachment_size).and_return(0) - - expect(Gitlab::AppLogger).to receive(:info).with( - hash_including(message: 'File exceeds maximum size', upload_allowed: upload_allowed)) - .and_call_original - - post api(path, user), params: { file: file } - end - end - - context 'with exempted project' do - before do - stub_env('GITLAB_UPLOAD_API_ALLOWLIST', project.id) - end - - it_behaves_like 'capped upload attachments', true - end - end - describe "GET /projects/:id/groups" do let_it_be(:root_group) { create(:group, :public, name: 'root group') } let_it_be(:project_group) { create(:group, :public, parent: root_group, name: 'project group') } diff --git a/spec/services/upload_service_spec.rb b/spec/services/upload_service_spec.rb index 4a8cd46172d..226b2a2b016 100644 --- a/spec/services/upload_service_spec.rb +++ b/spec/services/upload_service_spec.rb @@ -67,29 +67,6 @@ RSpec.describe UploadService, feature_category: :shared do it { expect(@link_to_file).to eq({}) } end - - describe '#override_max_attachment_size' do - let(:txt) { fixture_file_upload('spec/fixtures/doc_sample.txt', 'text/plain') } - let(:service) { described_class.new(@project, txt, FileUploader) } - - subject { service.execute.to_h } - - before do - allow(txt).to receive(:size) { 100.megabytes.to_i } - end - - it 'allows the upload' do - service.override_max_attachment_size = 101.megabytes - - expect(subject.keys).to eq(%i[alt url markdown]) - end - - it 'disallows the upload' do - service.override_max_attachment_size = 99.megabytes - - expect(subject).to eq({}) - end - end end def upload_file(project, file) diff --git a/yarn.lock b/yarn.lock index ee7e8fe11cd..513da1e0be1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11399,11 +11399,21 @@ pretender@^3.4.3: fake-xml-http-request "^2.1.1" route-recognizer "^0.3.3" -prettier@2.2.1, "prettier@^1.18.2 || ^2.0.0", prettier@^2.0.0: +prettier-plugin-tailwindcss@^0.6.5: + version "0.6.5" + resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.5.tgz#e05202784a3f41889711ae38c75c5b8cad72f368" + integrity sha512-axfeOArc/RiGHjOIy9HytehlC0ZLeMaqY09mm8YCkMzznKiDkwFzOpBvtuhuv3xG5qB73+Mj7OCe2j/L1ryfuQ== + +"prettier@^1.18.2 || ^2.0.0", prettier@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +prettier@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a" + integrity sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA== + pretty-format@^26.4.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93"