diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a1f2210c5ce..0987715dbcd 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -d2e978f8e8f47a49c3bcfbd470b2f790e52c5ee2 +ab2f2386ab69575cd0a58f7279be707a17d7a6c8 diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index c4ce702892e..dbc7ff67d9d 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -20,6 +20,7 @@ const Api = { projectPath: '/api/:version/projects/:id', forkedProjectsPath: '/api/:version/projects/:id/forks', projectLabelsPath: '/:namespace_path/:project_path/-/labels', + projectFileSchemaPath: '/:namespace_path/:project_path/-/schema/:ref/:filename', projectUsersPath: '/api/:version/projects/:id/users', projectMergeRequestsPath: '/api/:version/projects/:id/merge_requests', projectMergeRequestPath: '/api/:version/projects/:id/merge_requests/:mrid', diff --git a/app/assets/javascripts/design_management/components/list/item.vue b/app/assets/javascripts/design_management/components/list/item.vue index 7febda431c9..36ea812d92e 100644 --- a/app/assets/javascripts/design_management/components/list/item.vue +++ b/app/assets/javascripts/design_management/components/list/item.vue @@ -125,10 +125,12 @@ export default { params: { id: filename }, query: $route.query, }" - class="card cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new" + class="card gl-cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new" > -
-
+
+
@@ -145,25 +147,28 @@ export default { v-show="showImage" :src="imageLink" :alt="filename" - class="block mx-auto mw-100 mh-100 design-img" + class="gl-display-block gl-mx-auto gl-max-w-full mh-100 design-img" data-qa-selector="design_image" @load="onImageLoad" @error="onImageError" />
-
-
- {{ +
+
+ {{ filename }} {{ __('Updated') }}
-
- - +
+ + {{ notesCount }}
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index 28348544f1a..52e4f6704c6 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -14,7 +14,7 @@ import Editor from '../lib/editor'; import FileTemplatesBar from './file_templates/bar.vue'; import { __ } from '~/locale'; import { extractMarkdownImagesFromEntries } from '../stores/utils'; -import { getPathParent, readFileAsDataURL } from '../utils'; +import { getPathParent, readFileAsDataURL, registerSchema } from '../utils'; import { getRulesWithTraversal } from '../lib/editorconfig/parser'; import mapRulesToMonaco from '../lib/editorconfig/rules_mapper'; @@ -56,6 +56,7 @@ export default { 'isEditModeActive', 'isCommitModeActive', 'currentBranch', + 'getJsonSchemaForPath', ]), ...mapGetters('fileTemplates', ['showFileTemplatesBar']), shouldHideEditor() { @@ -197,6 +198,8 @@ export default { this.editor.clearEditor(); + this.registerSchemaForFile(); + Promise.all([this.fetchFileData(), this.fetchEditorconfigRules()]) .then(() => { this.createEditorInstance(); @@ -330,6 +333,10 @@ export default { // do nothing if no image is found in the clipboard return Promise.resolve(); }, + registerSchemaForFile() { + const schema = this.getJsonSchemaForPath(this.file.path); + registerSchema(schema); + }, }, viewerTypes, FILE_VIEW_MODE_EDITOR, diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js index f061fcb1259..2b12230c7cd 100644 --- a/app/assets/javascripts/ide/lib/editor.js +++ b/app/assets/javascripts/ide/lib/editor.js @@ -7,10 +7,9 @@ import ModelManager from './common/model_manager'; import { editorOptions, defaultEditorOptions, defaultDiffEditorOptions } from './editor_options'; import { themes } from './themes'; import languages from './languages'; -import schemas from './schemas'; import keymap from './keymap.json'; import { clearDomElement } from '~/editor/utils'; -import { registerLanguages, registerSchemas } from '../utils'; +import { registerLanguages } from '../utils'; function setupThemes() { themes.forEach(theme => { @@ -46,10 +45,6 @@ export default class Editor { setupThemes(); registerLanguages(...languages); - if (gon.features?.schemaLinting) { - registerSchemas(...schemas); - } - this.debouncedUpdate = debounce(() => { this.updateDimensions(); }, 200); diff --git a/app/assets/javascripts/ide/lib/schemas/index.js b/app/assets/javascripts/ide/lib/schemas/index.js deleted file mode 100644 index 38a2f81921b..00000000000 --- a/app/assets/javascripts/ide/lib/schemas/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import json from './json'; -import yaml from './yaml'; - -export default [json, yaml]; diff --git a/app/assets/javascripts/ide/lib/schemas/json/index.js b/app/assets/javascripts/ide/lib/schemas/json/index.js deleted file mode 100644 index 900d5442bec..00000000000 --- a/app/assets/javascripts/ide/lib/schemas/json/index.js +++ /dev/null @@ -1,8 +0,0 @@ -export default { - language: 'json', - options: { - validate: true, - enableSchemaRequest: true, - schemas: [], - }, -}; diff --git a/app/assets/javascripts/ide/lib/schemas/yaml/gitlab_ci.js b/app/assets/javascripts/ide/lib/schemas/yaml/gitlab_ci.js deleted file mode 100644 index af20744abb3..00000000000 --- a/app/assets/javascripts/ide/lib/schemas/yaml/gitlab_ci.js +++ /dev/null @@ -1,4 +0,0 @@ -export default { - uri: 'https://json.schemastore.org/gitlab-ci', - fileMatch: ['*.gitlab-ci.yml'], -}; diff --git a/app/assets/javascripts/ide/lib/schemas/yaml/index.js b/app/assets/javascripts/ide/lib/schemas/yaml/index.js deleted file mode 100644 index e3fc406df4b..00000000000 --- a/app/assets/javascripts/ide/lib/schemas/yaml/index.js +++ /dev/null @@ -1,12 +0,0 @@ -import gitlabCi from './gitlab_ci'; - -export default { - language: 'yaml', - options: { - validate: true, - enableSchemaRequest: true, - hover: true, - completion: true, - schemas: [gitlabCi], - }, -}; diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js index b5b4641acf4..b8304a9b68d 100644 --- a/app/assets/javascripts/ide/stores/getters.js +++ b/app/assets/javascripts/ide/stores/getters.js @@ -6,6 +6,7 @@ import { PERMISSION_CREATE_MR, PERMISSION_PUSH_CODE, } from '../constants'; +import Api from '~/api'; export const activeFile = state => state.openFiles.find(file => file.active) || null; @@ -177,3 +178,18 @@ export const getAvailableFileName = (state, getters) => path => { export const getUrlForPath = state => path => `/project/${state.currentProjectId}/tree/${state.currentBranchId}/-/${path}/`; + +export const getJsonSchemaForPath = (state, getters) => path => { + const [namespace, ...project] = state.currentProjectId.split('/'); + return { + uri: + // eslint-disable-next-line no-restricted-globals + location.origin + + Api.buildUrl(Api.projectFileSchemaPath) + .replace(':namespace_path', namespace) + .replace(':project_path', project.join('/')) + .replace(':ref', getters.currentBranch?.commit.id || state.currentBranchId) + .replace(':filename', path), + fileMatch: [`*${path}`], + }; +}; diff --git a/app/assets/javascripts/ide/utils.js b/app/assets/javascripts/ide/utils.js index 58a6712c232..ffc6e4c66f0 100644 --- a/app/assets/javascripts/ide/utils.js +++ b/app/assets/javascripts/ide/utils.js @@ -75,17 +75,17 @@ export function registerLanguages(def, ...defs) { languages.setLanguageConfiguration(languageId, def.conf); } -export function registerSchemas({ language, options }, ...schemas) { - schemas.forEach(schema => registerSchemas(schema)); - - const defaults = { - json: languages.json.jsonDefaults, - yaml: languages.yaml.yamlDefaults, - }; - - if (defaults[language]) { - defaults[language].setDiagnosticsOptions(options); - } +export function registerSchema(schema) { + const defaults = [languages.json.jsonDefaults, languages.yaml.yamlDefaults]; + defaults.forEach(d => + d.setDiagnosticsOptions({ + validate: true, + enableSchemaRequest: true, + hover: true, + completion: true, + schemas: [schema], + }), + ); } export const otherSide = side => (side === SIDE_RIGHT ? SIDE_LEFT : SIDE_RIGHT); diff --git a/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql b/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql new file mode 100644 index 00000000000..eb2dde14464 --- /dev/null +++ b/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql @@ -0,0 +1,3 @@ +fragment IncidentFields on Issue { + severity +} diff --git a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql index d7e51b076d8..dab130835e2 100644 --- a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql +++ b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql @@ -1,3 +1,5 @@ +#import "ee_else_ce/incidents/graphql/fragments/incident_fields.fragment.graphql" + query getIncidents( $projectPath: ID! $issueTypes: [IssueType!] @@ -39,8 +41,7 @@ query getIncidents( webUrl } } - statusPagePublishedIncident - severity + ...IncidentFields } pageInfo { hasNextPage diff --git a/app/assets/javascripts/issuable_bulk_update_sidebar.js b/app/assets/javascripts/issuable_bulk_update_sidebar.js index 85c2a370ff3..7d9cefbe66a 100644 --- a/app/assets/javascripts/issuable_bulk_update_sidebar.js +++ b/app/assets/javascripts/issuable_bulk_update_sidebar.js @@ -7,7 +7,7 @@ import MilestoneSelect from './milestone_select'; import issueStatusSelect from './issue_status_select'; import subscriptionSelect from './subscription_select'; import LabelsSelect from './labels_select'; -import issueableEventHub from './issuables_list/eventhub'; +import issueableEventHub from './issues_list/eventhub'; const HIDDEN_CLASS = 'hidden'; const DISABLED_CONTENT_CLASS = 'disabled-content'; diff --git a/app/assets/javascripts/issuables_list/components/issuable.vue b/app/assets/javascripts/issues_list/components/issuable.vue similarity index 100% rename from app/assets/javascripts/issuables_list/components/issuable.vue rename to app/assets/javascripts/issues_list/components/issuable.vue diff --git a/app/assets/javascripts/issuables_list/components/issuables_list_app.vue b/app/assets/javascripts/issues_list/components/issuables_list_app.vue similarity index 100% rename from app/assets/javascripts/issuables_list/components/issuables_list_app.vue rename to app/assets/javascripts/issues_list/components/issuables_list_app.vue diff --git a/app/assets/javascripts/issuables_list/components/issuable_list_root_app.vue b/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue similarity index 99% rename from app/assets/javascripts/issuables_list/components/issuable_list_root_app.vue rename to app/assets/javascripts/issues_list/components/jira_issues_list_root.vue index cc90d23eda7..61781c576c0 100644 --- a/app/assets/javascripts/issuables_list/components/issuable_list_root_app.vue +++ b/app/assets/javascripts/issues_list/components/jira_issues_list_root.vue @@ -11,7 +11,7 @@ import { } from '~/jira_import/utils/jira_import_utils'; export default { - name: 'IssuableListRoot', + name: 'JiraIssuesList', components: { GlAlert, GlLabel, diff --git a/app/assets/javascripts/issuables_list/constants.js b/app/assets/javascripts/issues_list/constants.js similarity index 100% rename from app/assets/javascripts/issuables_list/constants.js rename to app/assets/javascripts/issues_list/constants.js diff --git a/app/assets/javascripts/issuables_list/eventhub.js b/app/assets/javascripts/issues_list/eventhub.js similarity index 100% rename from app/assets/javascripts/issuables_list/eventhub.js rename to app/assets/javascripts/issues_list/eventhub.js diff --git a/app/assets/javascripts/issuables_list/index.js b/app/assets/javascripts/issues_list/index.js similarity index 89% rename from app/assets/javascripts/issuables_list/index.js rename to app/assets/javascripts/issues_list/index.js index fa23d6c0eed..1ff41c20d08 100644 --- a/app/assets/javascripts/issuables_list/index.js +++ b/app/assets/javascripts/issues_list/index.js @@ -2,10 +2,10 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import createDefaultClient from '~/lib/graphql'; import { parseBoolean, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import IssuableListRootApp from './components/issuable_list_root_app.vue'; +import JiraIssuesListRoot from './components/jira_issues_list_root.vue'; import IssuablesListApp from './components/issuables_list_app.vue'; -function mountIssuableListRootApp() { +function mountJiraIssuesListApp() { const el = document.querySelector('.js-projects-issues-root'); if (!el) { @@ -23,7 +23,7 @@ function mountIssuableListRootApp() { el, apolloProvider, render(createComponent) { - return createComponent(IssuableListRootApp, { + return createComponent(JiraIssuesListRoot, { props: { canEdit: parseBoolean(el.dataset.canEdit), isJiraConfigured: parseBoolean(el.dataset.isJiraConfigured), @@ -62,6 +62,6 @@ function mountIssuablesListApp() { } export default function initIssuablesList() { - mountIssuableListRootApp(); + mountJiraIssuesListApp(); mountIssuablesListApp(); } diff --git a/app/assets/javascripts/issuables_list/queries/get_issues_list_details.query.graphql b/app/assets/javascripts/issues_list/queries/get_issues_list_details.query.graphql similarity index 100% rename from app/assets/javascripts/issuables_list/queries/get_issues_list_details.query.graphql rename to app/assets/javascripts/issues_list/queries/get_issues_list_details.query.graphql diff --git a/app/assets/javascripts/issuables_list/service_desk_helper.js b/app/assets/javascripts/issues_list/service_desk_helper.js similarity index 100% rename from app/assets/javascripts/issuables_list/service_desk_helper.js rename to app/assets/javascripts/issues_list/service_desk_helper.js diff --git a/app/assets/javascripts/jira_import/utils/jira_import_utils.js b/app/assets/javascripts/jira_import/utils/jira_import_utils.js index a1186b087e1..edd6fad4aac 100644 --- a/app/assets/javascripts/jira_import/utils/jira_import_utils.js +++ b/app/assets/javascripts/jira_import/utils/jira_import_utils.js @@ -1,5 +1,5 @@ import { last } from 'lodash'; -import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issuables_list/constants'; +import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issues_list/constants'; export const IMPORT_STATE = { FAILED: 'failed', diff --git a/app/assets/javascripts/pages/groups/issues/index.js b/app/assets/javascripts/pages/groups/issues/index.js index 2496003919a..ae481d16ee9 100644 --- a/app/assets/javascripts/pages/groups/issues/index.js +++ b/app/assets/javascripts/pages/groups/issues/index.js @@ -1,5 +1,5 @@ import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; -import initIssuablesList from '~/issuables_list'; +import initIssuablesList from '~/issues_list'; import projectSelect from '~/project_select'; import initFilteredSearch from '~/pages/search/init_filtered_search'; import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar'; diff --git a/app/assets/javascripts/pages/projects/blob/show/index.js b/app/assets/javascripts/pages/projects/blob/show/index.js index cb7198e9789..46e59cd6572 100644 --- a/app/assets/javascripts/pages/projects/blob/show/index.js +++ b/app/assets/javascripts/pages/projects/blob/show/index.js @@ -6,6 +6,33 @@ import GpgBadges from '~/gpg_badges'; import '~/sourcegraph/load'; import PipelineTourSuccessModal from '~/blob/pipeline_tour_success_modal.vue'; +const createGitlabCiYmlVisualization = (containerId = '#js-blob-toggle-graph-preview') => { + const el = document.querySelector(containerId); + const { filename, blobData } = el?.dataset; + + const nameRegexp = /\.gitlab-ci.yml/; + + if (!el || !nameRegexp.test(filename)) { + return; + } + + // eslint-disable-next-line no-new + new Vue({ + el, + components: { + GitlabCiYamlVisualization: () => + import('~/pipelines/components/pipeline_graph/gitlab_ci_yaml_visualization.vue'), + }, + render(createElement) { + return createElement('gitlabCiYamlVisualization', { + props: { + blobData, + }, + }); + }, + }); +}; + document.addEventListener('DOMContentLoaded', () => { new BlobViewer(); // eslint-disable-line no-new initBlob(); @@ -63,4 +90,8 @@ document.addEventListener('DOMContentLoaded', () => { }); } } + + if (gon?.features?.gitlabCiYmlPreview) { + createGitlabCiYmlVisualization(); + } }); diff --git a/app/assets/javascripts/pages/projects/integrations/jira/issues/index/index.js b/app/assets/javascripts/pages/projects/integrations/jira/issues/index/index.js index 260ba69b4bc..534614349bf 100644 --- a/app/assets/javascripts/pages/projects/integrations/jira/issues/index/index.js +++ b/app/assets/javascripts/pages/projects/integrations/jira/issues/index/index.js @@ -1,4 +1,4 @@ -import initIssuablesList from '~/issuables_list'; +import initIssuablesList from '~/issues_list'; document.addEventListener('DOMContentLoaded', () => { initIssuablesList(); diff --git a/app/assets/javascripts/pages/projects/issues/index/index.js b/app/assets/javascripts/pages/projects/issues/index/index.js index 1711d122080..e1add4a2af3 100644 --- a/app/assets/javascripts/pages/projects/issues/index/index.js +++ b/app/assets/javascripts/pages/projects/issues/index/index.js @@ -7,7 +7,7 @@ import UsersSelect from '~/users_select'; import initFilteredSearch from '~/pages/search/init_filtered_search'; import { FILTERED_SEARCH } from '~/pages/constants'; import { ISSUABLE_INDEX } from '~/pages/projects/constants'; -import initIssuablesList from '~/issuables_list'; +import initIssuablesList from '~/issues_list'; import initManualOrdering from '~/manual_ordering'; import { showLearnGitLabIssuesPopover } from '~/onboarding_issues'; diff --git a/app/assets/javascripts/pages/projects/issues/service_desk/index.js b/app/assets/javascripts/pages/projects/issues/service_desk/index.js index 9304d9b6832..e0c1332796f 100644 --- a/app/assets/javascripts/pages/projects/issues/service_desk/index.js +++ b/app/assets/javascripts/pages/projects/issues/service_desk/index.js @@ -1,5 +1,5 @@ import FilteredSearchServiceDesk from './filtered_search'; -import initIssuablesList from '~/issuables_list'; +import initIssuablesList from '~/issues_list'; document.addEventListener('DOMContentLoaded', () => { const supportBotData = JSON.parse( diff --git a/app/assets/javascripts/performance_bar/index.js b/app/assets/javascripts/performance_bar/index.js index d29099b872a..f29b5f42d8f 100644 --- a/app/assets/javascripts/performance_bar/index.js +++ b/app/assets/javascripts/performance_bar/index.js @@ -5,6 +5,8 @@ import axios from '~/lib/utils/axios_utils'; import PerformanceBarService from './services/performance_bar_service'; import PerformanceBarStore from './stores/performance_bar_store'; +import initPerformanceBarLog from './performance_bar_log'; + const initPerformanceBar = el => { const performanceBarData = el.dataset; @@ -128,4 +130,6 @@ document.addEventListener('DOMContentLoaded', () => { } }); +initPerformanceBarLog(); + export default initPerformanceBar; diff --git a/app/assets/javascripts/performance_bar/performance_bar_log.js b/app/assets/javascripts/performance_bar/performance_bar_log.js new file mode 100644 index 00000000000..638c544f2e1 --- /dev/null +++ b/app/assets/javascripts/performance_bar/performance_bar_log.js @@ -0,0 +1,28 @@ +/* eslint-disable no-console */ +import { getCLS, getFID, getLCP } from 'web-vitals'; + +const initVitalsLog = () => { + const reportVital = data => { + console.log(`${String.fromCodePoint(0x1f4c8)} ${data.name} : `, data); + }; + + console.log( + `${String.fromCodePoint( + 0x1f4d1, + )} To get the final web vital numbers reported you maybe need to switch away and back to the tab`, + ); + getCLS(reportVital); + getFID(reportVital); + getLCP(reportVital); +}; + +const initPerformanceBarLog = () => { + console.log( + `%c ${String.fromCodePoint(0x1f98a)} GitLab performance bar`, + 'width:100%;background-color: #292961; color: #FFFFFF; font-size:24px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto; padding: 10px;display:block;padding-right: 100px;', + ); + + initVitalsLog(); +}; + +export default initPerformanceBarLog; diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/gitlab_ci_yaml_visualization.vue b/app/assets/javascripts/pipelines/components/pipeline_graph/gitlab_ci_yaml_visualization.vue new file mode 100644 index 00000000000..3cc76425e2a --- /dev/null +++ b/app/assets/javascripts/pipelines/components/pipeline_graph/gitlab_ci_yaml_visualization.vue @@ -0,0 +1,76 @@ + + diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/job_pill.vue b/app/assets/javascripts/pipelines/components/pipeline_graph/job_pill.vue new file mode 100644 index 00000000000..19d41b166c3 --- /dev/null +++ b/app/assets/javascripts/pipelines/components/pipeline_graph/job_pill.vue @@ -0,0 +1,24 @@ + + diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue new file mode 100644 index 00000000000..6a0d3cce1f3 --- /dev/null +++ b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue @@ -0,0 +1,57 @@ + + diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/stage_pill.vue b/app/assets/javascripts/pipelines/components/pipeline_graph/stage_pill.vue new file mode 100644 index 00000000000..7b2458db725 --- /dev/null +++ b/app/assets/javascripts/pipelines/components/pipeline_graph/stage_pill.vue @@ -0,0 +1,35 @@ + + diff --git a/app/assets/javascripts/pipelines/utils.js b/app/assets/javascripts/pipelines/utils.js index a7825df6f04..bd53b22784c 100644 --- a/app/assets/javascripts/pipelines/utils.js +++ b/app/assets/javascripts/pipelines/utils.js @@ -4,3 +4,46 @@ import { SUPPORTED_FILTER_PARAMETERS } from './constants'; export const validateParams = params => { return pickBy(params, (val, key) => SUPPORTED_FILTER_PARAMETERS.includes(key) && val); }; + +/** + * This function takes a json payload that comes from a yml + * file converted to json through `jsyaml` library. Because we + * naively convert the entire yaml to json, some keys (like `includes`) + * are irrelevant to rendering the graph and must be removed. We also + * restructure the data to have the structure from an API response for the + * pipeline data. + * @param {Object} jsonData + * @returns {Array} - Array of stages containing all jobs + */ +export const preparePipelineGraphData = jsonData => { + const jsonKeys = Object.keys(jsonData); + const jobNames = jsonKeys.filter(job => jsonData[job]?.stage); + + // We merge both the stages from the "stages" key in the yaml and the stage associated + // with each job to show the user both the stages they explicitly defined, and those + // that they added under jobs. We also remove duplicates. + const jobStages = jobNames.map(job => jsonData[job].stage); + const userDefinedStages = jsonData?.stages ?? []; + + // The order is important here. We always show the stages in order they were + // defined in the `stages` key first, and then stages that are under the jobs. + const stages = Array.from(new Set([...userDefinedStages, ...jobStages])); + + const arrayOfJobsByStage = stages.map(val => { + return jobNames.filter(job => { + return jsonData[job].stage === val; + }); + }); + + const pipelineData = stages.map((stage, index) => { + const stageJobs = arrayOfJobsByStage[index]; + return { + name: stage, + groups: stageJobs.map(job => { + return { name: job, jobs: [{ ...jsonData[job] }] }; + }), + }; + }); + + return { stages: pipelineData }; +}; diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 0f81a86b29c..8b104ce9017 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -1081,3 +1081,19 @@ button.mini-pipeline-graph-dropdown-toggle { .progress-bar.bg-primary { background-color: $blue-500 !important; } + +.pipeline-stage-pill { + width: 10rem; +} + +.pipeline-job-pill { + width: 8rem; +} + +.stage-left-rounded { + border-radius: 2rem 0 0 2rem; +} + +.stage-right-rounded { + border-radius: 0 2rem 2rem 0; +} diff --git a/app/controllers/admin/instance_statistics_controller.rb b/app/controllers/admin/instance_statistics_controller.rb index 30c49eb3e5f..3aee26b97a2 100644 --- a/app/controllers/admin/instance_statistics_controller.rb +++ b/app/controllers/admin/instance_statistics_controller.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true class Admin::InstanceStatisticsController < Admin::ApplicationController + include Analytics::UniqueVisitsHelper + before_action :check_feature_flag + track_unique_visits :index, target_id: 'i_analytics_instance_statistics' + def index end diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index f4fc7decb60..7a5b470f366 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -100,7 +100,7 @@ module NotesActions # the finder. Here, we select between returning all notes since then, or a # page's worth of notes. def gather_notes - if Feature.enabled?(:paginated_notes, project) + if Feature.enabled?(:paginated_notes, noteable.try(:resource_parent)) gather_some_notes else gather_all_notes diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb index 99e1b9027fa..965493955ac 100644 --- a/app/controllers/profiles/keys_controller.rb +++ b/app/controllers/profiles/keys_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class Profiles::KeysController < Profiles::ApplicationController + skip_before_action :authenticate_user!, only: [:get_keys] + def index @keys = current_user.keys.order_id_desc @key = Key.new @@ -31,6 +33,25 @@ class Profiles::KeysController < Profiles::ApplicationController end end + # Get all keys of a user(params[:username]) in a text format + # Helpful for sysadmins to put in respective servers + def get_keys + if params[:username].present? + begin + user = UserFinder.new(params[:username]).find_by_username + if user.present? + render plain: user.all_ssh_keys.join("\n") + else + render_404 + end + rescue => e + render html: e.message + end + else + render_404 + end + end + private def key_params diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index e447ac874df..1568d9966dd 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -35,6 +35,7 @@ class Projects::BlobController < Projects::ApplicationController before_action only: :show do push_frontend_feature_flag(:code_navigation, @project, default_enabled: true) push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline) + push_frontend_feature_flag(:gitlab_ci_yml_preview, @project, default_enabled: false) end track_redis_hll_event :create, :update, name: 'g_edit_by_sfe', feature: :track_editor_edit_actions, feature_default_enabled: true diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 95ea31fa977..75a861423ed 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -37,12 +37,6 @@ class UsersController < ApplicationController end end - # Get all keys of a user(params[:username]) in a text format - # Helpful for sysadmins to put in respective servers - def ssh_keys - render plain: user.all_ssh_keys.join("\n") - end - def activity respond_to do |format| format.html { render 'show' } diff --git a/app/models/snippet.rb b/app/models/snippet.rb index f4c3fa5acc3..1cf3097861c 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -214,7 +214,7 @@ class Snippet < ApplicationRecord def blobs return [] unless repository_exists? - repository.ls_files(repository.root_ref).map { |file| Blob.lazy(repository, repository.root_ref, file) } + repository.ls_files(default_branch).map { |file| Blob.lazy(repository, default_branch, file) } end def hook_attrs @@ -309,6 +309,11 @@ class Snippet < ApplicationRecord end end + override :default_branch + def default_branch + super || 'master' + end + def repository_storage snippet_repository&.shard_name || self.class.pick_repository_storage end @@ -336,17 +341,17 @@ class Snippet < ApplicationRecord def file_name_on_repo return if repository.empty? - list_files(repository.root_ref).first + list_files(default_branch).first end def list_files(ref = nil) return [] if repository.empty? - repository.ls_files(ref) + repository.ls_files(ref || default_branch) end def multiple_files? - list_files(repository.root_ref).size > 1 + list_files.size > 1 end class << self diff --git a/app/models/snippet_repository.rb b/app/models/snippet_repository.rb index 6f4d33ff500..2cfb201191d 100644 --- a/app/models/snippet_repository.rb +++ b/app/models/snippet_repository.rb @@ -93,7 +93,7 @@ class SnippetRepository < ApplicationRecord end def get_last_empty_file_index - repository.ls_files(nil).inject(0) do |max, file| + repository.ls_files(snippet.default_branch).inject(0) do |max, file| idx = file[EMPTY_FILE_PATTERN, 1].to_i [idx, max].max end diff --git a/app/models/snippet_statistics.rb b/app/models/snippet_statistics.rb index 7439f98d114..8545296d076 100644 --- a/app/models/snippet_statistics.rb +++ b/app/models/snippet_statistics.rb @@ -25,7 +25,7 @@ class SnippetStatistics < ApplicationRecord def update_file_count count = if snippet.repository_exists? - repository.ls_files(repository.root_ref).size + repository.ls_files(snippet.default_branch).size else 0 end diff --git a/app/models/terraform/state.rb b/app/models/terraform/state.rb index c50b9da1310..419fffcb666 100644 --- a/app/models/terraform/state.rb +++ b/app/models/terraform/state.rb @@ -5,27 +5,34 @@ module Terraform include UsageStatistics include FileStoreMounter - DEFAULT = '{"version":1}'.freeze HEX_REGEXP = %r{\A\h+\z}.freeze UUID_LENGTH = 32 belongs_to :project belongs_to :locked_by_user, class_name: 'User' + has_many :versions, class_name: 'Terraform::StateVersion', foreign_key: :terraform_state_id + has_one :latest_version, -> { ordered_by_version_desc }, class_name: 'Terraform::StateVersion', foreign_key: :terraform_state_id + + scope :versioning_not_enabled, -> { where(versioning_enabled: false) } + validates :project_id, presence: true validates :uuid, presence: true, uniqueness: true, length: { is: UUID_LENGTH }, format: { with: HEX_REGEXP, message: 'only allows hex characters' } default_value_for(:uuid, allows_nil: false) { SecureRandom.hex(UUID_LENGTH / 2) } + default_value_for(:versioning_enabled, true) mount_file_store_uploader StateUploader - default_value_for(:file) { CarrierWaveStringFile.new(DEFAULT) } - def file_store super || StateUploader.default_store end + def latest_file + versioning_enabled ? latest_version&.file : file + end + def local? file_store == ObjectStorage::Store::LOCAL end @@ -33,6 +40,17 @@ module Terraform def locked? self.lock_xid.present? end + + def update_file!(data, version:) + if versioning_enabled? + new_version = versions.build(version: version) + new_version.assign_attributes(created_by_user: locked_by_user, file: data) + new_version.save! + else + self.file = data + save! + end + end end end diff --git a/app/models/terraform/state_version.rb b/app/models/terraform/state_version.rb new file mode 100644 index 00000000000..d5e315d18a1 --- /dev/null +++ b/app/models/terraform/state_version.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module Terraform + class StateVersion < ApplicationRecord + include FileStoreMounter + + belongs_to :terraform_state, class_name: 'Terraform::State', optional: false + belongs_to :created_by_user, class_name: 'User', optional: true + + scope :ordered_by_version_desc, -> { order(version: :desc) } + + default_value_for(:file_store) { VersionedStateUploader.default_store } + + mount_file_store_uploader VersionedStateUploader + + delegate :project_id, :uuid, to: :terraform_state, allow_nil: true + end +end diff --git a/app/presenters/alert_management/alert_presenter.rb b/app/presenters/alert_management/alert_presenter.rb index 231e90163be..5debe6d5dbd 100644 --- a/app/presenters/alert_management/alert_presenter.rb +++ b/app/presenters/alert_management/alert_presenter.rb @@ -46,7 +46,7 @@ module AlertManagement def issue_summary_markdown <<~MARKDOWN.chomp #{metadata_list} - #{alert_details}#{metric_embed_for_alert} + #{metric_embed_for_alert} MARKDOWN end @@ -65,23 +65,6 @@ module AlertManagement metadata.join(MARKDOWN_LINE_BREAK) end - def alert_details - if details.present? - <<~MARKDOWN.chomp - - #### Alert Details - - #{details_list} - MARKDOWN - end - end - - def details_list - details - .map { |label, value| list_item(label, value) } - .join(MARKDOWN_LINE_BREAK) - end - def metric_embed_for_alert "\n[](#{metrics_dashboard_url})" if metrics_dashboard_url end diff --git a/app/presenters/projects/prometheus/alert_presenter.rb b/app/presenters/projects/prometheus/alert_presenter.rb index 8ee7e2d2b34..783b2b2b1e0 100644 --- a/app/presenters/projects/prometheus/alert_presenter.rb +++ b/app/presenters/projects/prometheus/alert_presenter.rb @@ -51,18 +51,10 @@ module Projects def issue_summary_markdown <<~MARKDOWN.chomp #{metadata_list} - #{alert_details}#{metric_embed_for_alert} + #{metric_embed_for_alert} MARKDOWN end - def details_list - strong_memoize(:details_list) do - details - .map { |label, value| list_item(label, value) } - .join(MARKDOWN_LINE_BREAK) - end - end - def metric_embed_for_alert "\n[](#{metrics_dashboard_url})" if metrics_dashboard_url end @@ -111,17 +103,6 @@ module Projects Gitlab::Utils::InlineHash.merge_keys(payload) end - def alert_details - if details.present? - <<~MARKDOWN.chomp - - #### Alert Details - - #{details_list} - MARKDOWN - end - end - def list_item(key, value) "**#{key}:** #{value}".strip end diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb index a9be38ee7e6..fb7683f940d 100644 --- a/app/services/issues/create_service.rb +++ b/app/services/issues/create_service.rb @@ -21,7 +21,7 @@ module Issues user = current_user issue.run_after_commit do NewIssueWorker.perform_async(issue.id, user.id) - IssuePlacementWorker.perform_async(issue.id) + IssuePlacementWorker.perform_async(nil, issue.project_id) end end diff --git a/app/services/snippets/create_service.rb b/app/services/snippets/create_service.rb index dab47de8a36..5c9b2eb1aea 100644 --- a/app/services/snippets/create_service.rb +++ b/app/services/snippets/create_service.rb @@ -82,7 +82,7 @@ module Snippets def create_commit commit_attrs = { - branch_name: 'master', + branch_name: @snippet.default_branch, message: 'Initial commit' } diff --git a/app/services/snippets/repository_validation_service.rb b/app/services/snippets/repository_validation_service.rb index c8197795383..5bf5e692ef4 100644 --- a/app/services/snippets/repository_validation_service.rb +++ b/app/services/snippets/repository_validation_service.rb @@ -39,7 +39,7 @@ module Snippets def check_branch_name_default! branches = repository.branch_names - return if branches.first == Gitlab::Checks::SnippetCheck::DEFAULT_BRANCH + return if branches.first == snippet.default_branch raise RepositoryValidationError, _('Repository has an invalid default branch name.') end @@ -51,7 +51,7 @@ module Snippets end def check_file_count! - file_count = repository.ls_files(nil).size + file_count = repository.ls_files(snippet.default_branch).size limit = Snippet.max_file_limit(current_user) if file_count > limit diff --git a/app/services/snippets/update_service.rb b/app/services/snippets/update_service.rb index 00146389e22..a0e9ab6ffda 100644 --- a/app/services/snippets/update_service.rb +++ b/app/services/snippets/update_service.rb @@ -93,7 +93,7 @@ module Snippets raise UpdateError unless snippet.snippet_repository commit_attrs = { - branch_name: 'master', + branch_name: snippet.default_branch, message: 'Update snippet' } diff --git a/app/uploaders/terraform/versioned_state_uploader.rb b/app/uploaders/terraform/versioned_state_uploader.rb new file mode 100644 index 00000000000..be07993da0f --- /dev/null +++ b/app/uploaders/terraform/versioned_state_uploader.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Terraform + class VersionedStateUploader < StateUploader + def filename + "#{model.version}.tfstate" + end + + def store_dir + Gitlab::HashedPath.new(model.uuid, root_hash: project_id) + end + end +end diff --git a/app/views/projects/blob/_content.html.haml b/app/views/projects/blob/_content.html.haml index 7afbd85cd6d..11946f22811 100644 --- a/app/views/projects/blob/_content.html.haml +++ b/app/views/projects/blob/_content.html.haml @@ -1,6 +1,10 @@ - simple_viewer = blob.simple_viewer - rich_viewer = blob.rich_viewer - rich_viewer_active = rich_viewer && params[:viewer] != 'simple' +- blob_data = defined?(@blob) ? @blob.data : {} +- filename = defined?(@blob) ? @blob.name : '' + +#js-blob-toggle-graph-preview{ data: { blob_data: blob_data, filename: filename } } = render 'projects/blob/viewer', viewer: simple_viewer, hidden: rich_viewer_active diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index 8aa4a935384..454a0694355 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -4,8 +4,10 @@ - state_human_name, state_icon_name = state_name_with_icon(@merge_request) - if @merge_request.closed_without_fork? - .alert.alert-danger - The source project of this merge request has been removed. + .gl-alert.gl-alert-danger.gl-mb-5 + = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') + .gl-alert-body + The source project of this merge request has been removed. .detail-page-header.border-bottom-0.pt-0.pb-0 .detail-page-header-body diff --git a/app/views/shared/_file_highlight.html.haml b/app/views/shared/_file_highlight.html.haml index a99c992af49..7d328728332 100644 --- a/app/views/shared/_file_highlight.html.haml +++ b/app/views/shared/_file_highlight.html.haml @@ -1,4 +1,4 @@ -.file-content.code.js-syntax-highlight +#blob-content.file-content.code.js-syntax-highlight .line-numbers - if blob.data.present? - link_icon = sprite_icon('link', size: 12) diff --git a/app/workers/issue_placement_worker.rb b/app/workers/issue_placement_worker.rb index 06791dfb1e7..a8d59e9125c 100644 --- a/app/workers/issue_placement_worker.rb +++ b/app/workers/issue_placement_worker.rb @@ -14,7 +14,7 @@ class IssuePlacementWorker # rubocop: disable CodeReuse/ActiveRecord def perform(issue_id, project_id = nil) - issue = Issue.id_in(issue_id).first + issue = find_issue(issue_id, project_id) return unless issue # Move the oldest 100 unpositioned items to the end. @@ -31,10 +31,19 @@ class IssuePlacementWorker Issue.move_nulls_to_end(to_place) Issues::BaseService.new(nil).rebalance_if_needed(to_place.max_by(&:relative_position)) - IssuePlacementWorker.perform_async(leftover.id) if leftover.present? + IssuePlacementWorker.perform_async(nil, leftover.project_id) if leftover.present? rescue RelativePositioning::NoSpaceLeft => e - Gitlab::ErrorTracking.log_exception(e, issue_id: issue_id) - IssueRebalancingWorker.perform_async(nil, issue.project_id) + Gitlab::ErrorTracking.log_exception(e, issue_id: issue_id, project_id: project_id) + IssueRebalancingWorker.perform_async(nil, project_id.presence || issue.project_id) end # rubocop: enable CodeReuse/ActiveRecord + + def find_issue(issue_id, project_id) + return Issue.id_in(issue_id).first if issue_id + + project = Project.id_in(project_id).first + return unless project + + project.issues.first + end end diff --git a/changelogs/unreleased/207347-add-terraform-state-versioning.yml b/changelogs/unreleased/207347-add-terraform-state-versioning.yml new file mode 100644 index 00000000000..69efd6a40d4 --- /dev/null +++ b/changelogs/unreleased/207347-add-terraform-state-versioning.yml @@ -0,0 +1,5 @@ +--- +title: Add versioning support to Terraform state backend +merge_request: 35211 +author: +type: added diff --git a/changelogs/unreleased/233659-replace-bootstrap-alerts-in-app-views-projects-merge_requests-_mr_.yml b/changelogs/unreleased/233659-replace-bootstrap-alerts-in-app-views-projects-merge_requests-_mr_.yml new file mode 100644 index 00000000000..100c84b5f53 --- /dev/null +++ b/changelogs/unreleased/233659-replace-bootstrap-alerts-in-app-views-projects-merge_requests-_mr_.yml @@ -0,0 +1,5 @@ +--- +title: Replace bootstrap alerts in app/views/projects/merge_requests/_mr_title.html.haml +merge_request: 41399 +author: Gilang Gumilar +type: changed diff --git a/changelogs/unreleased/233919-add-instance-statistics-to-usage-ping.yml b/changelogs/unreleased/233919-add-instance-statistics-to-usage-ping.yml new file mode 100644 index 00000000000..c7873319610 --- /dev/null +++ b/changelogs/unreleased/233919-add-instance-statistics-to-usage-ping.yml @@ -0,0 +1,5 @@ +--- +title: Add instance statistics visits to usage data +merge_request: 42211 +author: +type: other diff --git a/changelogs/unreleased/235756-ssh-public-keys-no-longer-public-accessible.yml b/changelogs/unreleased/235756-ssh-public-keys-no-longer-public-accessible.yml new file mode 100644 index 00000000000..2ccaf5d9eb1 --- /dev/null +++ b/changelogs/unreleased/235756-ssh-public-keys-no-longer-public-accessible.yml @@ -0,0 +1,5 @@ +--- +title: Make SSH keys publicly accessible +merge_request: 42288 +author: +type: fixed diff --git a/changelogs/unreleased/ajk-issue-placement-worker-deduplication.yml b/changelogs/unreleased/ajk-issue-placement-worker-deduplication.yml new file mode 100644 index 00000000000..e03f7c20dec --- /dev/null +++ b/changelogs/unreleased/ajk-issue-placement-worker-deduplication.yml @@ -0,0 +1,5 @@ +--- +title: Pass project ID to issue placement worker +merge_request: 42091 +author: +type: performance diff --git a/changelogs/unreleased/fix-219551_project_token_http.yml b/changelogs/unreleased/fix-219551_project_token_http.yml new file mode 100644 index 00000000000..f5ac75702dc --- /dev/null +++ b/changelogs/unreleased/fix-219551_project_token_http.yml @@ -0,0 +1,5 @@ +--- +title: allow project bot account to clone through http +merge_request: 40635 +author: Philippe Vienne @PhilippeVienne +type: fixed diff --git a/changelogs/unreleased/tr-fix-incident-list-ce.yml b/changelogs/unreleased/tr-fix-incident-list-ce.yml new file mode 100644 index 00000000000..ea136f1a95d --- /dev/null +++ b/changelogs/unreleased/tr-fix-incident-list-ce.yml @@ -0,0 +1,5 @@ +--- +title: Fix incident list by restricting query on FOSS +merge_request: 42301 +author: +type: fixed diff --git a/config/feature_flags/development/gitlab_ci_yml_preview.yml b/config/feature_flags/development/gitlab_ci_yml_preview.yml new file mode 100644 index 00000000000..ea03b25874c --- /dev/null +++ b/config/feature_flags/development/gitlab_ci_yml_preview.yml @@ -0,0 +1,7 @@ +--- +name: gitlab_ci_yml_preview +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40880 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/244905 +group: group::ci +type: development +default_enabled: false diff --git a/config/routes/user.rb b/config/routes/user.rb index c7a5a56d9ed..63329277e33 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -55,7 +55,7 @@ end constraints(::Constraints::UserUrlConstrainer.new) do # Get all keys of user - get ':username.keys', controller: :users, action: :ssh_keys, constraints: { username: Gitlab::PathRegex.root_namespace_route_regex } + get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: Gitlab::PathRegex.root_namespace_route_regex } scope(path: ':username', as: :user, diff --git a/db/migrate/20200610033228_create_terraform_state_versions.rb b/db/migrate/20200610033228_create_terraform_state_versions.rb new file mode 100644 index 00000000000..10e9faa56ab --- /dev/null +++ b/db/migrate/20200610033228_create_terraform_state_versions.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +class CreateTerraformStateVersions < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + create_table :terraform_state_versions, if_not_exists: true do |t| + t.references :terraform_state, index: false, null: false, foreign_key: { on_delete: :cascade } + t.references :created_by_user, foreign_key: false + t.timestamps_with_timezone null: false + t.integer :version, null: false + t.integer :file_store, limit: 2, null: false + t.text :file, null: false + + t.index [:terraform_state_id, :version], unique: true, name: 'index_terraform_state_versions_on_state_id_and_version' + end + + add_text_limit :terraform_state_versions, :file, 255 + end + + def down + drop_table :terraform_state_versions + end +end diff --git a/db/migrate/20200610040615_add_versioning_enabled_to_terraform_states.rb b/db/migrate/20200610040615_add_versioning_enabled_to_terraform_states.rb new file mode 100644 index 00000000000..51a9fd3908b --- /dev/null +++ b/db/migrate/20200610040615_add_versioning_enabled_to_terraform_states.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddVersioningEnabledToTerraformStates < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + add_column :terraform_states, :versioning_enabled, :boolean, null: false, default: false + end +end diff --git a/db/migrate/20200611013227_add_users_foreign_key_to_terraform_state_versions.rb b/db/migrate/20200611013227_add_users_foreign_key_to_terraform_state_versions.rb new file mode 100644 index 00000000000..b599622c776 --- /dev/null +++ b/db/migrate/20200611013227_add_users_foreign_key_to_terraform_state_versions.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddUsersForeignKeyToTerraformStateVersions < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_foreign_key :terraform_state_versions, :users, column: :created_by_user_id, on_delete: :nullify + end + + def down + with_lock_retries do + remove_foreign_key_if_exists :terraform_state_versions, :users, column: :created_by_user_id + end + end +end diff --git a/db/schema_migrations/20200610033228 b/db/schema_migrations/20200610033228 new file mode 100644 index 00000000000..8e02b4c92ec --- /dev/null +++ b/db/schema_migrations/20200610033228 @@ -0,0 +1 @@ +354524319f4c426328c7485619e248d00df323842873eaf7a2b3fbd2ad93048f \ No newline at end of file diff --git a/db/schema_migrations/20200610040615 b/db/schema_migrations/20200610040615 new file mode 100644 index 00000000000..6faeed1adaf --- /dev/null +++ b/db/schema_migrations/20200610040615 @@ -0,0 +1 @@ +1f698671f226289fa1eabbb988b94ecd6486038f4922076bb981e44ee2356b25 \ No newline at end of file diff --git a/db/schema_migrations/20200611013227 b/db/schema_migrations/20200611013227 new file mode 100644 index 00000000000..e7f829d1875 --- /dev/null +++ b/db/schema_migrations/20200611013227 @@ -0,0 +1 @@ +d0ede6c4a28988494b0e18c073e56c1d985de73c443cc6b6d99e0b34a7f37642 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index ec8147b1cae..3d2e94311dd 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -15994,6 +15994,27 @@ CREATE SEQUENCE public.term_agreements_id_seq ALTER SEQUENCE public.term_agreements_id_seq OWNED BY public.term_agreements.id; +CREATE TABLE public.terraform_state_versions ( + id bigint NOT NULL, + terraform_state_id bigint NOT NULL, + created_by_user_id bigint, + created_at timestamp with time zone NOT NULL, + updated_at timestamp with time zone NOT NULL, + version integer NOT NULL, + file_store smallint NOT NULL, + file text NOT NULL, + CONSTRAINT check_0824bb7bbd CHECK ((char_length(file) <= 255)) +); + +CREATE SEQUENCE public.terraform_state_versions_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +ALTER SEQUENCE public.terraform_state_versions_id_seq OWNED BY public.terraform_state_versions.id; + CREATE TABLE public.terraform_states ( id bigint NOT NULL, project_id bigint NOT NULL, @@ -16011,6 +16032,7 @@ CREATE TABLE public.terraform_states ( verification_retry_count smallint, verification_checksum bytea, verification_failure text, + versioning_enabled boolean DEFAULT false NOT NULL, CONSTRAINT check_21a47163ea CHECK ((char_length(verification_failure) <= 255)) ); @@ -17563,6 +17585,8 @@ ALTER TABLE ONLY public.tags ALTER COLUMN id SET DEFAULT nextval('public.tags_id ALTER TABLE ONLY public.term_agreements ALTER COLUMN id SET DEFAULT nextval('public.term_agreements_id_seq'::regclass); +ALTER TABLE ONLY public.terraform_state_versions ALTER COLUMN id SET DEFAULT nextval('public.terraform_state_versions_id_seq'::regclass); + ALTER TABLE ONLY public.terraform_states ALTER COLUMN id SET DEFAULT nextval('public.terraform_states_id_seq'::regclass); ALTER TABLE ONLY public.timelogs ALTER COLUMN id SET DEFAULT nextval('public.timelogs_id_seq'::regclass); @@ -18871,6 +18895,9 @@ ALTER TABLE ONLY public.tags ALTER TABLE ONLY public.term_agreements ADD CONSTRAINT term_agreements_pkey PRIMARY KEY (id); +ALTER TABLE ONLY public.terraform_state_versions + ADD CONSTRAINT terraform_state_versions_pkey PRIMARY KEY (id); + ALTER TABLE ONLY public.terraform_states ADD CONSTRAINT terraform_states_pkey PRIMARY KEY (id); @@ -21115,6 +21142,10 @@ CREATE INDEX index_term_agreements_on_term_id ON public.term_agreements USING bt CREATE INDEX index_term_agreements_on_user_id ON public.term_agreements USING btree (user_id); +CREATE INDEX index_terraform_state_versions_on_created_by_user_id ON public.terraform_state_versions USING btree (created_by_user_id); + +CREATE UNIQUE INDEX index_terraform_state_versions_on_state_id_and_version ON public.terraform_state_versions USING btree (terraform_state_id, version); + CREATE INDEX index_terraform_states_on_file_store ON public.terraform_states USING btree (file_store); CREATE INDEX index_terraform_states_on_locked_by_user_id ON public.terraform_states USING btree (locked_by_user_id); @@ -21913,6 +21944,9 @@ ALTER TABLE ONLY public.geo_event_log ALTER TABLE ONLY public.projects ADD CONSTRAINT fk_6e5c14658a FOREIGN KEY (pool_repository_id) REFERENCES public.pool_repositories(id) ON DELETE SET NULL; +ALTER TABLE ONLY public.terraform_state_versions + ADD CONSTRAINT fk_6e81384d7f FOREIGN KEY (created_by_user_id) REFERENCES public.users(id) ON DELETE SET NULL; + ALTER TABLE ONLY public.protected_branch_push_access_levels ADD CONSTRAINT fk_7111b68cdb FOREIGN KEY (group_id) REFERENCES public.namespaces(id) ON DELETE CASCADE; @@ -22336,6 +22370,9 @@ ALTER TABLE ONLY public.events ALTER TABLE ONLY public.ip_restrictions ADD CONSTRAINT fk_rails_04a93778d5 FOREIGN KEY (group_id) REFERENCES public.namespaces(id) ON DELETE CASCADE; +ALTER TABLE ONLY public.terraform_state_versions + ADD CONSTRAINT fk_rails_04f176e239 FOREIGN KEY (terraform_state_id) REFERENCES public.terraform_states(id) ON DELETE CASCADE; + ALTER TABLE ONLY public.ci_build_report_results ADD CONSTRAINT fk_rails_056d298d48 FOREIGN KEY (project_id) REFERENCES public.projects(id) ON DELETE CASCADE; diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index dce272e575f..7c3abb548df 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -9407,6 +9407,16 @@ type MergeRequest implements CurrentUserTodos & Noteable { """ allowCollaboration: Boolean + """ + Number of approvals left + """ + approvalsLeft: Int + + """ + Number of approvals required + """ + approvalsRequired: Int + """ Indicates if the merge request has all the required approvals. Returns true if no required approvals are configured. """ diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index 10b830f8d51..6e9838725d5 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -26108,6 +26108,34 @@ "isDeprecated": false, "deprecationReason": null }, + { + "name": "approvalsLeft", + "description": "Number of approvals left", + "args": [ + + ], + "type": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "approvalsRequired", + "description": "Number of approvals required", + "args": [ + + ], + "type": { + "kind": "SCALAR", + "name": "Int", + "ofType": null + }, + "isDeprecated": false, + "deprecationReason": null + }, { "name": "approved", "description": "Indicates if the merge request has all the required approvals. Returns true if no required approvals are configured.", diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 3e480a34db9..7c1f3861757 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -1416,6 +1416,8 @@ Autogenerated return type of MarkAsSpamSnippet. | Field | Type | Description | | ----- | ---- | ----------- | | `allowCollaboration` | Boolean | Indicates if members of the target project can push to the fork | +| `approvalsLeft` | Int | Number of approvals left | +| `approvalsRequired` | Int | Number of approvals required | | `approved` | Boolean! | Indicates if the merge request has all the required approvals. Returns true if no required approvals are configured. | | `author` | User | User who created this merge request | | `autoMergeEnabled` | Boolean! | Indicates if auto merge is enabled for the merge request | diff --git a/doc/user/project/repository/reducing_the_repo_size_using_git.md b/doc/user/project/repository/reducing_the_repo_size_using_git.md index 2a641121931..5f698454c59 100644 --- a/doc/user/project/repository/reducing_the_repo_size_using_git.md +++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md @@ -14,11 +14,9 @@ Git repositories become larger over time. When large files are added to a Git re - Git repository storage limits [can be reached](#storage-limits). Rewriting a repository can remove unwanted history to make the repository smaller. -[`git filter-repo`](https://github.com/newren/git-filter-repo) is a tool for quickly rewriting Git -repository history, and is recommended over both: - -- [`git filter-branch`](https://git-scm.com/docs/git-filter-branch). -- [BFG](https://rtyley.github.io/bfg-repo-cleaner/). +We **recommend [`git filter-repo`](https://github.com/newren/git-filter-repo/blob/main/README.md)** +over [`git filter-branch`](https://git-scm.com/docs/git-filter-branch) and +[BFG](https://rtyley.github.io/bfg-repo-cleaner/). DANGER: **Danger:** Rewriting repository history is a destructive operation. Make sure to backup your repository before diff --git a/lib/api/terraform/state.rb b/lib/api/terraform/state.rb index f6e966defce..7063a3d08b5 100644 --- a/lib/api/terraform/state.rb +++ b/lib/api/terraform/state.rb @@ -35,10 +35,10 @@ module API route_setting :authentication, basic_auth_personal_access_token: true, job_token_allowed: :basic_auth get do remote_state_handler.find_with_lock do |state| - no_content! unless state.file.exists? + no_content! unless state.latest_file && state.latest_file.exists? env['api.format'] = :binary # this bypasses json serialization - body state.file.read + body state.latest_file.read status :ok end end @@ -52,8 +52,7 @@ module API no_content! if data.empty? remote_state_handler.handle_with_lock do |state| - state.file = CarrierWaveStringFile.new(data) - state.save! + state.update_file!(CarrierWaveStringFile.new(data), version: params[:serial]) status :ok end end diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index ca3ea21461f..609eef5e365 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -50,7 +50,7 @@ module Gitlab build_access_token_check(login, password) || lfs_token_check(login, password, project) || oauth_access_token_check(login, password) || - personal_access_token_check(password) || + personal_access_token_check(password, project) || deploy_token_check(login, password, project) || user_with_password_for_git(login, password) || Gitlab::Auth::Result.new @@ -189,12 +189,18 @@ module Gitlab end end - def personal_access_token_check(password) + def personal_access_token_check(password, project) return unless password.present? token = PersonalAccessTokensFinder.new(state: 'active').find_by_token(password) - if token && valid_scoped_token?(token, all_available_scopes) && token.user.can?(:log_in) + return unless token + + return if project && token.user.project_bot? && !project.bots.include?(token.user) + + return unless valid_scoped_token?(token, all_available_scopes) + + if token.user.project_bot? || token.user.can?(:log_in) Gitlab::Auth::Result.new(token.user, nil, :personal_access_token, abilities_for_scopes(token.scopes)) end end diff --git a/lib/gitlab/checks/snippet_check.rb b/lib/gitlab/checks/snippet_check.rb index bcecd0fc251..8c61b782baa 100644 --- a/lib/gitlab/checks/snippet_check.rb +++ b/lib/gitlab/checks/snippet_check.rb @@ -3,7 +3,6 @@ module Gitlab module Checks class SnippetCheck < BaseChecker - DEFAULT_BRANCH = 'master'.freeze ERROR_MESSAGES = { create_delete_branch: 'You can not create or delete branches.' }.freeze @@ -11,17 +10,18 @@ module Gitlab ATTRIBUTES = %i[oldrev newrev ref branch_name tag_name logger].freeze attr_reader(*ATTRIBUTES) - def initialize(change, logger:) + def initialize(change, default_branch:, logger:) @oldrev, @newrev, @ref = change.values_at(:oldrev, :newrev, :ref) @branch_name = Gitlab::Git.branch_name(@ref) @tag_name = Gitlab::Git.tag_name(@ref) + @default_branch = default_branch @logger = logger @logger.append_message("Running checks for ref: #{@branch_name || @tag_name}") end def validate! - if creation? || deletion? + if !@default_branch || creation? || deletion? raise GitAccess::ForbiddenError, ERROR_MESSAGES[:create_delete_branch] end @@ -31,7 +31,7 @@ module Gitlab private def creation? - @branch_name != DEFAULT_BRANCH && super + @branch_name != @default_branch && super end end end diff --git a/lib/gitlab/git_access_snippet.rb b/lib/gitlab/git_access_snippet.rb index f2b4e930707..ae83e45f2b3 100644 --- a/lib/gitlab/git_access_snippet.rb +++ b/lib/gitlab/git_access_snippet.rb @@ -119,7 +119,7 @@ module Gitlab override :check_single_change_access def check_single_change_access(change, _skip_lfs_integrity_check: false) - Checks::SnippetCheck.new(change, logger: logger).validate! + Checks::SnippetCheck.new(change, default_branch: snippet.default_branch, logger: logger).validate! Checks::PushFileCountCheck.new(change, repository: repository, limit: Snippet.max_file_limit(user), logger: logger).validate! rescue Checks::TimedLogger::TimeoutError raise TimeoutError, logger.full_message diff --git a/lib/gitlab/usage_data_counters/known_events.yml b/lib/gitlab/usage_data_counters/known_events.yml index a0f20405bb8..375195ed38d 100644 --- a/lib/gitlab/usage_data_counters/known_events.yml +++ b/lib/gitlab/usage_data_counters/known_events.yml @@ -77,6 +77,10 @@ category: analytics redis_slot: analytics aggregation: weekly +- name: i_analytics_instance_statistics + category: analytics + redis_slot: analytics + aggregation: weekly - name: g_edit_by_web_ide category: ide_edit redis_slot: edit diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f38e9a97187..337dfe3d4d3 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -17002,6 +17002,9 @@ msgstr "" msgid "No containers available" msgstr "" +msgid "No content to show" +msgstr "" + msgid "No contributions" msgstr "" @@ -28083,6 +28086,9 @@ msgstr "" msgid "VisualReviewApp|Steps 1 and 2 (and sometimes 3) are performed once by the developer before requesting feedback. Steps 3 (if necessary), 4 is performed by the reviewer each time they perform a review." msgstr "" +msgid "Visualization" +msgstr "" + msgid "Vulnerabilities" msgstr "" diff --git a/package.json b/package.json index 9569a0d997e..f8d4230ee54 100644 --- a/package.json +++ b/package.json @@ -153,6 +153,7 @@ "vue-virtual-scroll-list": "^1.4.4", "vuedraggable": "^2.23.0", "vuex": "^3.5.1", + "web-vitals": "^0.2.4", "webpack": "^4.42.0", "webpack-bundle-analyzer": "^3.6.0", "webpack-cli": "^3.3.11", diff --git a/qa/qa/page/project/issue/index.rb b/qa/qa/page/project/issue/index.rb index 0a64f01fe98..0b47bec2cf1 100644 --- a/qa/qa/page/project/issue/index.rb +++ b/qa/qa/page/project/issue/index.rb @@ -5,7 +5,7 @@ module QA module Project module Issue class Index < Page::Base - view 'app/assets/javascripts/issuables_list/components/issuable.vue' do + view 'app/assets/javascripts/issues_list/components/issuable.vue' do element :issue_container element :issue_link end diff --git a/spec/controllers/admin/cohorts_controller_spec.rb b/spec/controllers/admin/cohorts_controller_spec.rb index bf9c6dc27ce..9eb2a713517 100644 --- a/spec/controllers/admin/cohorts_controller_spec.rb +++ b/spec/controllers/admin/cohorts_controller_spec.rb @@ -18,7 +18,6 @@ RSpec.describe Admin::CohortsController do describe 'GET #index' do it_behaves_like 'tracking unique visits', :index do - let(:request_params) { {} } let(:target_id) { 'i_analytics_cohorts' } end end diff --git a/spec/controllers/admin/dev_ops_report_controller_spec.rb b/spec/controllers/admin/dev_ops_report_controller_spec.rb index e69f8bf7462..0be30fff0c2 100644 --- a/spec/controllers/admin/dev_ops_report_controller_spec.rb +++ b/spec/controllers/admin/dev_ops_report_controller_spec.rb @@ -18,7 +18,6 @@ RSpec.describe Admin::DevOpsReportController do end it_behaves_like 'tracking unique visits', :show do - let(:request_params) { {} } let(:target_id) { 'i_analytics_dev_ops_score' } end end diff --git a/spec/controllers/admin/instance_statistics_controller_spec.rb b/spec/controllers/admin/instance_statistics_controller_spec.rb new file mode 100644 index 00000000000..c589e46857f --- /dev/null +++ b/spec/controllers/admin/instance_statistics_controller_spec.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Admin::InstanceStatisticsController do + let(:admin) { create(:user, :admin) } + + before do + sign_in(admin) + end + + describe 'GET #show' do + it_behaves_like 'tracking unique visits', :index do + let(:target_id) { 'i_analytics_instance_statistics' } + end + end +end diff --git a/spec/controllers/profiles/keys_controller_spec.rb b/spec/controllers/profiles/keys_controller_spec.rb index 66f6135df1e..17964ef4a43 100644 --- a/spec/controllers/profiles/keys_controller_spec.rb +++ b/spec/controllers/profiles/keys_controller_spec.rb @@ -20,4 +20,108 @@ RSpec.describe Profiles::KeysController do expect(Key.last.expires_at).to be_like_time(expires_at) end end + + describe "#get_keys" do + describe "non existent user" do + it "does not generally work" do + get :get_keys, params: { username: 'not-existent' } + + expect(response).not_to be_successful + end + end + + describe "user with no keys" do + it "does generally work" do + get :get_keys, params: { username: user.username } + + expect(response).to be_successful + end + + it "renders all keys separated with a new line" do + get :get_keys, params: { username: user.username } + + expect(response.body).to eq("") + end + it "responds with text/plain content type" do + get :get_keys, params: { username: user.username } + expect(response.content_type).to eq("text/plain") + end + end + + describe "user with keys" do + let!(:key) { create(:key, user: user) } + let!(:another_key) { create(:another_key, user: user) } + let!(:deploy_key) { create(:deploy_key, user: user) } + + describe "while signed in" do + before do + sign_in(user) + end + + it "does generally work" do + get :get_keys, params: { username: user.username } + + expect(response).to be_successful + end + + it "renders all non deploy keys separated with a new line" do + get :get_keys, params: { username: user.username } + + expect(response.body).not_to eq('') + expect(response.body).to eq(user.all_ssh_keys.join("\n")) + + expect(response.body).to include(key.key.sub(' dummy@gitlab.com', '')) + expect(response.body).to include(another_key.key.sub(' dummy@gitlab.com', '')) + + expect(response.body).not_to include(deploy_key.key) + end + + it "does not render the comment of the key" do + get :get_keys, params: { username: user.username } + expect(response.body).not_to match(/dummy@gitlab.com/) + end + + it "responds with text/plain content type" do + get :get_keys, params: { username: user.username } + + expect(response.content_type).to eq("text/plain") + end + end + + describe 'when logged out' do + before do + sign_out(user) + end + + it "still does generally work" do + get :get_keys, params: { username: user.username } + + expect(response).to be_successful + end + + it "renders all non deploy keys separated with a new line" do + get :get_keys, params: { username: user.username } + + expect(response.body).not_to eq('') + expect(response.body).to eq(user.all_ssh_keys.join("\n")) + + expect(response.body).to include(key.key.sub(' dummy@gitlab.com', '')) + expect(response.body).to include(another_key.key.sub(' dummy@gitlab.com', '')) + + expect(response.body).not_to include(deploy_key.key) + end + + it "does not render the comment of the key" do + get :get_keys, params: { username: user.username } + expect(response.body).not_to match(/dummy@gitlab.com/) + end + + it "responds with text/plain content type" do + get :get_keys, params: { username: user.username } + + expect(response.content_type).to eq("text/plain") + end + end + end + end end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 99c3b82bd0d..bec4b24484a 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -114,71 +114,6 @@ RSpec.describe UsersController do end end - describe "#ssh_keys" do - describe "non existent user" do - it "does not generally work" do - get :ssh_keys, params: { username: 'not-existent' } - - expect(response).not_to be_successful - end - end - - describe "user with no keys" do - it "does generally work" do - get :ssh_keys, params: { username: user.username } - - expect(response).to be_successful - end - - it "renders all keys separated with a new line" do - get :ssh_keys, params: { username: user.username } - - expect(response.body).to eq("") - end - - it "responds with text/plain content type" do - get :ssh_keys, params: { username: user.username } - expect(response.content_type).to eq("text/plain") - end - end - - describe "user with keys" do - let!(:key) { create(:key, user: user) } - let!(:another_key) { create(:another_key, user: user) } - let!(:deploy_key) { create(:deploy_key, user: user) } - - it "does generally work" do - get :ssh_keys, params: { username: user.username } - - expect(response).to be_successful - end - - it "renders all non deploy keys separated with a new line" do - get :ssh_keys, params: { username: user.username } - - expect(response.body).not_to eq('') - expect(response.body).to eq(user.all_ssh_keys.join("\n")) - - expect(response.body).to include(key.key.sub(' dummy@gitlab.com', '')) - expect(response.body).to include(another_key.key.sub(' dummy@gitlab.com', '')) - - expect(response.body).not_to include(deploy_key.key) - end - - it "does not render the comment of the key" do - get :ssh_keys, params: { username: user.username } - - expect(response.body).not_to match(/dummy@gitlab.com/) - end - - it "responds with text/plain content type" do - get :ssh_keys, params: { username: user.username } - - expect(response.content_type).to eq("text/plain") - end - end - end - describe 'GET #calendar' do context 'for user' do let(:project) { create(:project) } diff --git a/spec/factories/terraform/state.rb b/spec/factories/terraform/state.rb index 94769290ac5..9decc89ef39 100644 --- a/spec/factories/terraform/state.rb +++ b/spec/factories/terraform/state.rb @@ -7,6 +7,7 @@ FactoryBot.define do sequence(:name) { |n| "state-#{n}" } trait :with_file do + versioning_enabled { false } file { fixture_file_upload('spec/fixtures/terraform/terraform.tfstate', 'application/json') } end @@ -25,5 +26,14 @@ FactoryBot.define do with_file verification_failure { 'Could not calculate the checksum' } end + + trait :with_version do + after(:create) do |state| + create(:terraform_state_version, :with_file, terraform_state: state) + end + end + + # Remove with https://gitlab.com/gitlab-org/gitlab/-/issues/235108 + factory :legacy_terraform_state, parent: :terraform_state, traits: [:with_file] end end diff --git a/spec/factories/terraform/state_version.rb b/spec/factories/terraform/state_version.rb new file mode 100644 index 00000000000..d1bd78215e3 --- /dev/null +++ b/spec/factories/terraform/state_version.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :terraform_state_version, class: 'Terraform::StateVersion' do + terraform_state factory: :terraform_state + created_by_user factory: :user + + sequence(:version) + file { fixture_file_upload('spec/fixtures/terraform/terraform.tfstate', 'application/json') } + end +end diff --git a/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap b/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap index 4388f710f45..822df1f6472 100644 --- a/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap +++ b/spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap @@ -10,11 +10,11 @@ exports[`Design management list item component when item appears in view after i exports[`Design management list item component with notes renders item with multiple comments 1`] = `
@@ -23,7 +23,7 @@ exports[`Design management list item component with notes renders item with mult test @@ -31,13 +31,13 @@ exports[`Design management list item component with notes renders item with mult
test @@ -57,17 +57,17 @@ exports[`Design management list item component with notes renders item with mult
2 @@ -80,11 +80,11 @@ exports[`Design management list item component with notes renders item with mult exports[`Design management list item component with notes renders item with single comment 1`] = `
@@ -93,7 +93,7 @@ exports[`Design management list item component with notes renders item with sing test @@ -101,13 +101,13 @@ exports[`Design management list item component with notes renders item with sing
test @@ -127,17 +127,17 @@ exports[`Design management list item component with notes renders item with sing
1 diff --git a/spec/frontend/ide/lib/editor_spec.js b/spec/frontend/ide/lib/editor_spec.js index 529f80e6f6f..01c2eab33a5 100644 --- a/spec/frontend/ide/lib/editor_spec.js +++ b/spec/frontend/ide/lib/editor_spec.js @@ -202,28 +202,6 @@ describe('Multi-file editor library', () => { }); }); - describe('schemas', () => { - let originalGon; - - beforeEach(() => { - originalGon = window.gon; - window.gon = { features: { schemaLinting: true } }; - - delete Editor.editorInstance; - instance = Editor.create(); - }); - - afterEach(() => { - window.gon = originalGon; - }); - - it('registers custom schemas defined with Monaco', () => { - expect(monacoLanguages.yaml.yamlDefaults.diagnosticsOptions).toMatchObject({ - schemas: [{ fileMatch: ['*.gitlab-ci.yml'] }], - }); - }); - }); - describe('replaceSelectedText', () => { let model; let editor; diff --git a/spec/frontend/ide/stores/getters_spec.js b/spec/frontend/ide/stores/getters_spec.js index 17fc08144f6..e24f08fa802 100644 --- a/spec/frontend/ide/stores/getters_spec.js +++ b/spec/frontend/ide/stores/getters_spec.js @@ -1,3 +1,4 @@ +import { TEST_HOST } from 'helpers/test_constants'; import * as getters from '~/ide/stores/getters'; import { createStore } from '~/ide/stores'; import { file } from '../helpers'; @@ -493,4 +494,37 @@ describe('IDE store getters', () => { ); }); }); + + describe('getJsonSchemaForPath', () => { + beforeEach(() => { + localState.currentProjectId = 'path/to/some/project'; + localState.currentBranchId = 'master'; + }); + + it('returns a json schema uri and match config for a json/yaml file that can be loaded by monaco', () => { + expect(localStore.getters.getJsonSchemaForPath('.gitlab-ci.yml')).toEqual({ + fileMatch: ['*.gitlab-ci.yml'], + uri: `${TEST_HOST}/path/to/some/project/-/schema/master/.gitlab-ci.yml`, + }); + }); + + it('returns a path containing sha if branch details are present in state', () => { + localState.projects['path/to/some/project'] = { + name: 'project', + branches: { + master: { + name: 'master', + commit: { + id: 'abcdef123456', + }, + }, + }, + }; + + expect(localStore.getters.getJsonSchemaForPath('.gitlab-ci.yml')).toEqual({ + fileMatch: ['*.gitlab-ci.yml'], + uri: `${TEST_HOST}/path/to/some/project/-/schema/abcdef123456/.gitlab-ci.yml`, + }); + }); + }); }); diff --git a/spec/frontend/ide/utils_spec.js b/spec/frontend/ide/utils_spec.js index e7ef0de45a0..4a1e1f3c45e 100644 --- a/spec/frontend/ide/utils_spec.js +++ b/spec/frontend/ide/utils_spec.js @@ -2,7 +2,7 @@ import { languages } from 'monaco-editor'; import { isTextFile, registerLanguages, - registerSchemas, + registerSchema, trimPathComponents, insertFinalNewline, trimTrailingWhitespace, @@ -159,55 +159,37 @@ describe('WebIDE utils', () => { }); }); - describe('registerSchemas', () => { - let options; + describe('registerSchema', () => { + let schema; beforeEach(() => { - options = { - validate: true, - enableSchemaRequest: true, - hover: true, - completion: true, - schemas: [ - { - uri: 'http://myserver/foo-schema.json', - fileMatch: ['*'], - schema: { - id: 'http://myserver/foo-schema.json', - type: 'object', - properties: { - p1: { enum: ['v1', 'v2'] }, - p2: { $ref: 'http://myserver/bar-schema.json' }, - }, - }, + schema = { + uri: 'http://myserver/foo-schema.json', + fileMatch: ['*'], + schema: { + id: 'http://myserver/foo-schema.json', + type: 'object', + properties: { + p1: { enum: ['v1', 'v2'] }, + p2: { $ref: 'http://myserver/bar-schema.json' }, }, - { - uri: 'http://myserver/bar-schema.json', - schema: { - id: 'http://myserver/bar-schema.json', - type: 'object', - properties: { q1: { enum: ['x1', 'x2'] } }, - }, - }, - ], + }, }; jest.spyOn(languages.json.jsonDefaults, 'setDiagnosticsOptions'); jest.spyOn(languages.yaml.yamlDefaults, 'setDiagnosticsOptions'); }); - it.each` - language | defaultsObj - ${'json'} | ${languages.json.jsonDefaults} - ${'yaml'} | ${languages.yaml.yamlDefaults} - `( - 'registers the given schemas with monaco for lang: $language', - ({ language, defaultsObj }) => { - registerSchemas({ language, options }); + it('registers the given schemas with monaco for both json and yaml languages', () => { + registerSchema(schema); - expect(defaultsObj.setDiagnosticsOptions).toHaveBeenCalledWith(options); - }, - ); + expect(languages.json.jsonDefaults.setDiagnosticsOptions).toHaveBeenCalledWith( + expect.objectContaining({ schemas: [schema] }), + ); + expect(languages.yaml.yamlDefaults.setDiagnosticsOptions).toHaveBeenCalledWith( + expect.objectContaining({ schemas: [schema] }), + ); + }); }); describe('trimTrailingWhitespace', () => { diff --git a/spec/frontend/issuables_list/components/__snapshots__/issuables_list_app_spec.js.snap b/spec/frontend/issues_list/components/__snapshots__/issuables_list_app_spec.js.snap similarity index 100% rename from spec/frontend/issuables_list/components/__snapshots__/issuables_list_app_spec.js.snap rename to spec/frontend/issues_list/components/__snapshots__/issuables_list_app_spec.js.snap diff --git a/spec/frontend/issuables_list/components/issuable_spec.js b/spec/frontend/issues_list/components/issuable_spec.js similarity index 99% rename from spec/frontend/issuables_list/components/issuable_spec.js rename to spec/frontend/issues_list/components/issuable_spec.js index 74be7d87847..c20684cc385 100644 --- a/spec/frontend/issuables_list/components/issuable_spec.js +++ b/spec/frontend/issues_list/components/issuable_spec.js @@ -5,7 +5,7 @@ import { trimText } from 'helpers/text_helper'; import initUserPopovers from '~/user_popovers'; import { formatDate } from '~/lib/utils/datetime_utility'; import { mergeUrlParams } from '~/lib/utils/url_utility'; -import Issuable from '~/issuables_list/components/issuable.vue'; +import Issuable from '~/issues_list/components/issuable.vue'; import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; import { simpleIssue, testAssignees, testLabels } from '../issuable_list_test_data'; import { isScopedLabel } from '~/lib/utils/common_utils'; diff --git a/spec/frontend/issuables_list/components/issuables_list_app_spec.js b/spec/frontend/issues_list/components/issuables_list_app_spec.js similarity index 98% rename from spec/frontend/issuables_list/components/issuables_list_app_spec.js rename to spec/frontend/issues_list/components/issuables_list_app_spec.js index 53a20ac69cb..1f80b4fc54a 100644 --- a/spec/frontend/issuables_list/components/issuables_list_app_spec.js +++ b/spec/frontend/issues_list/components/issuables_list_app_spec.js @@ -9,14 +9,14 @@ import { import waitForPromises from 'helpers/wait_for_promises'; import { TEST_HOST } from 'helpers/test_constants'; import { deprecatedCreateFlash as flash } from '~/flash'; -import IssuablesListApp from '~/issuables_list/components/issuables_list_app.vue'; -import Issuable from '~/issuables_list/components/issuable.vue'; +import IssuablesListApp from '~/issues_list/components/issuables_list_app.vue'; +import Issuable from '~/issues_list/components/issuable.vue'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; -import issueablesEventBus from '~/issuables_list/eventhub'; -import { PAGE_SIZE, PAGE_SIZE_MANUAL, RELATIVE_POSITION } from '~/issuables_list/constants'; +import issueablesEventBus from '~/issues_list/eventhub'; +import { PAGE_SIZE, PAGE_SIZE_MANUAL, RELATIVE_POSITION } from '~/issues_list/constants'; jest.mock('~/flash'); -jest.mock('~/issuables_list/eventhub'); +jest.mock('~/issues_list/eventhub'); jest.mock('~/lib/utils/common_utils', () => ({ ...jest.requireActual('~/lib/utils/common_utils'), scrollToElement: () => {}, diff --git a/spec/frontend/issuables_list/components/issuable_list_root_app_spec.js b/spec/frontend/issues_list/components/jira_issues_list_root_spec.js similarity index 94% rename from spec/frontend/issuables_list/components/issuable_list_root_app_spec.js rename to spec/frontend/issues_list/components/jira_issues_list_root_spec.js index 7aa1c290f61..eecb092a330 100644 --- a/spec/frontend/issuables_list/components/issuable_list_root_app_spec.js +++ b/spec/frontend/issues_list/components/jira_issues_list_root_spec.js @@ -1,9 +1,9 @@ import { GlAlert, GlLabel } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import Vue from 'vue'; -import IssuableListRootApp from '~/issuables_list/components/issuable_list_root_app.vue'; +import JiraIssuesListRoot from '~/issues_list/components/jira_issues_list_root.vue'; -describe('IssuableListRootApp', () => { +describe('JiraIssuesListRoot', () => { const issuesPath = 'gitlab-org/gitlab-test/-/issues'; const label = { color: '#333', @@ -19,7 +19,7 @@ describe('IssuableListRootApp', () => { shouldShowFinishedAlert = false, shouldShowInProgressAlert = false, } = {}) => - shallowMount(IssuableListRootApp, { + shallowMount(JiraIssuesListRoot, { propsData: { canEdit: true, isJiraConfigured: true, diff --git a/spec/frontend/issuables_list/issuable_list_test_data.js b/spec/frontend/issues_list/issuable_list_test_data.js similarity index 100% rename from spec/frontend/issuables_list/issuable_list_test_data.js rename to spec/frontend/issues_list/issuable_list_test_data.js diff --git a/spec/frontend/issuables_list/service_desk_helper_spec.js b/spec/frontend/issues_list/service_desk_helper_spec.js similarity index 94% rename from spec/frontend/issuables_list/service_desk_helper_spec.js rename to spec/frontend/issues_list/service_desk_helper_spec.js index 901b58e01a3..16aee853341 100644 --- a/spec/frontend/issuables_list/service_desk_helper_spec.js +++ b/spec/frontend/issues_list/service_desk_helper_spec.js @@ -1,4 +1,4 @@ -import { emptyStateHelper, generateMessages } from '~/issuables_list/service_desk_helper'; +import { emptyStateHelper, generateMessages } from '~/issues_list/service_desk_helper'; describe('service desk helper', () => { const emptyStateMessages = generateMessages({}); diff --git a/spec/frontend/jira_import/utils/jira_import_utils_spec.js b/spec/frontend/jira_import/utils/jira_import_utils_spec.js index 8ae1fc3535a..0992c9e8d16 100644 --- a/spec/frontend/jira_import/utils/jira_import_utils_spec.js +++ b/spec/frontend/jira_import/utils/jira_import_utils_spec.js @@ -8,7 +8,7 @@ import { setFinishedAlertHideMap, shouldShowFinishedAlert, } from '~/jira_import/utils/jira_import_utils'; -import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issuables_list/constants'; +import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issues_list/constants'; useLocalStorageSpy(); diff --git a/spec/frontend/pipelines/pipeline_graph/gitlab_ci_yaml_visualization_spec.js b/spec/frontend/pipelines/pipeline_graph/gitlab_ci_yaml_visualization_spec.js new file mode 100644 index 00000000000..fea42350959 --- /dev/null +++ b/spec/frontend/pipelines/pipeline_graph/gitlab_ci_yaml_visualization_spec.js @@ -0,0 +1,47 @@ +import { shallowMount } from '@vue/test-utils'; +import { GlTab } from '@gitlab/ui'; +import { yamlString } from './mock_data'; +import PipelineGraph from '~/pipelines/components/pipeline_graph/pipeline_graph.vue'; +import GitlabCiYamlVisualization from '~/pipelines/components/pipeline_graph/gitlab_ci_yaml_visualization.vue'; + +describe('gitlab yaml visualization component', () => { + const defaultProps = { blobData: yamlString }; + let wrapper; + + const createComponent = props => { + return shallowMount(GitlabCiYamlVisualization, { + propsData: { + ...defaultProps, + ...props, + }, + }); + }; + + const findGlTabComponents = () => wrapper.findAll(GlTab); + const findPipelineGraph = () => wrapper.find(PipelineGraph); + + afterEach(() => { + wrapper.destroy(); + wrapper = null; + }); + + describe('tabs component', () => { + beforeEach(() => { + wrapper = createComponent(); + }); + + it('renders the file and visualization tabs', () => { + expect(findGlTabComponents()).toHaveLength(2); + }); + }); + + describe('graph component', () => { + beforeEach(() => { + wrapper = createComponent(); + }); + + it('is hidden by default', () => { + expect(findPipelineGraph().exists()).toBe(false); + }); + }); +}); diff --git a/spec/frontend/pipelines/pipeline_graph/mock_data.js b/spec/frontend/pipelines/pipeline_graph/mock_data.js new file mode 100644 index 00000000000..5a5d6c021a6 --- /dev/null +++ b/spec/frontend/pipelines/pipeline_graph/mock_data.js @@ -0,0 +1,80 @@ +export const yamlString = `stages: +- empty +- build +- test +- deploy +- final + +include: +- template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml' + +build_a: + stage: build + script: echo hello +build_b: + stage: build + script: echo hello +build_c: + stage: build + script: echo hello +build_d: + stage: Queen + script: echo hello + +test_a: + stage: test + script: ls + needs: [build_a, build_b, build_c] +test_b: + stage: test + script: ls + needs: [build_a, build_b, build_d] +test_c: + stage: test + script: ls + needs: [build_a, build_b, build_c] + +deploy_a: + stage: deploy + script: echo hello +`; + +export const pipelineData = { + stages: [ + { + name: 'build', + groups: [], + }, + { + name: 'build', + groups: [ + { + name: 'build_1', + jobs: [{ script: 'echo hello', stage: 'build' }], + }, + ], + }, + { + name: 'test', + groups: [ + { + name: 'test_1', + jobs: [{ script: 'yarn test', stage: 'test' }], + }, + { + name: 'test_2', + jobs: [{ script: 'yarn karma', stage: 'test' }], + }, + ], + }, + { + name: 'deploy', + groups: [ + { + name: 'deploy_1', + jobs: [{ script: 'yarn magick', stage: 'deploy' }], + }, + ], + }, + ], +}; diff --git a/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js b/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js new file mode 100644 index 00000000000..30e192e5726 --- /dev/null +++ b/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js @@ -0,0 +1,59 @@ +import { shallowMount } from '@vue/test-utils'; +import { pipelineData } from './mock_data'; +import PipelineGraph from '~/pipelines/components/pipeline_graph/pipeline_graph.vue'; +import StagePill from '~/pipelines/components/pipeline_graph/stage_pill.vue'; +import JobPill from '~/pipelines/components/pipeline_graph/job_pill.vue'; + +describe('pipeline graph component', () => { + const defaultProps = { pipelineData }; + let wrapper; + + const createComponent = props => { + return shallowMount(PipelineGraph, { + propsData: { + ...defaultProps, + ...props, + }, + }); + }; + + const findAllStagePills = () => wrapper.findAll(StagePill); + const findAllJobPills = () => wrapper.findAll(JobPill); + + afterEach(() => { + wrapper.destroy(); + wrapper = null; + }); + + describe('with no data', () => { + beforeEach(() => { + wrapper = createComponent({ pipelineData: {} }); + }); + + it('renders an empty section', () => { + expect(wrapper.text()).toContain('No content to show'); + expect(findAllStagePills()).toHaveLength(0); + expect(findAllJobPills()).toHaveLength(0); + }); + }); + + describe('with data', () => { + beforeEach(() => { + wrapper = createComponent(); + }); + it('renders the right number of stage pills', () => { + const expectedStagesLength = pipelineData.stages.length; + + expect(findAllStagePills()).toHaveLength(expectedStagesLength); + }); + + it('renders the right number of job pills', () => { + // We count the number of jobs in the mock data + const expectedJobsLength = pipelineData.stages.reduce((acc, val) => { + return acc + val.groups.length; + }, 0); + + expect(findAllJobPills()).toHaveLength(expectedJobsLength); + }); + }); +}); diff --git a/spec/frontend/pipelines/pipeline_graph/utils_spec.js b/spec/frontend/pipelines/pipeline_graph/utils_spec.js new file mode 100644 index 00000000000..dd85c8c2bd0 --- /dev/null +++ b/spec/frontend/pipelines/pipeline_graph/utils_spec.js @@ -0,0 +1,150 @@ +import { preparePipelineGraphData } from '~/pipelines/utils'; + +describe('preparePipelineGraphData', () => { + const emptyResponse = { stages: [] }; + const jobName1 = 'build_1'; + const jobName2 = 'build_2'; + const jobName3 = 'test_1'; + const jobName4 = 'deploy_1'; + const job1 = { [jobName1]: { script: 'echo hello', stage: 'build' } }; + const job2 = { [jobName2]: { script: 'echo build', stage: 'build' } }; + const job3 = { [jobName3]: { script: 'echo test', stage: 'test' } }; + const job4 = { [jobName4]: { script: 'echo deploy', stage: 'deploy' } }; + + describe('returns an object with an empty array of stages if', () => { + it('no data is passed', () => { + expect(preparePipelineGraphData({})).toEqual(emptyResponse); + }); + + it('no stages are found', () => { + expect(preparePipelineGraphData({ includes: 'template/myTemplate.gitlab-ci.yml' })).toEqual( + emptyResponse, + ); + }); + }); + + describe('returns the correct array of stages', () => { + it('when multiple jobs are in the same stage', () => { + const expectedData = { + stages: [ + { + name: job1[jobName1].stage, + groups: [ + { + name: jobName1, + jobs: [{ script: job1[jobName1].script, stage: job1[jobName1].stage }], + }, + { + name: jobName2, + jobs: [{ script: job2[jobName2].script, stage: job2[jobName2].stage }], + }, + ], + }, + ], + }; + + expect(preparePipelineGraphData({ ...job1, ...job2 })).toEqual(expectedData); + }); + + it('when stages are defined by the user', () => { + const userDefinedStage = 'myStage'; + const userDefinedStage2 = 'myStage2'; + + const expectedData = { + stages: [ + { + name: userDefinedStage, + groups: [], + }, + { + name: userDefinedStage2, + groups: [], + }, + ], + }; + + expect(preparePipelineGraphData({ stages: [userDefinedStage, userDefinedStage2] })).toEqual( + expectedData, + ); + }); + + it('by combining user defined stage and job stages, it preserves user defined order', () => { + const userDefinedStage = 'myStage'; + const userDefinedStageThatOverlaps = 'deploy'; + + const expectedData = { + stages: [ + { + name: userDefinedStage, + groups: [], + }, + { + name: job4[jobName4].stage, + groups: [ + { + name: jobName4, + jobs: [{ script: job4[jobName4].script, stage: job4[jobName4].stage }], + }, + ], + }, + { + name: job1[jobName1].stage, + groups: [ + { + name: jobName1, + jobs: [{ script: job1[jobName1].script, stage: job1[jobName1].stage }], + }, + { + name: jobName2, + jobs: [{ script: job2[jobName2].script, stage: job2[jobName2].stage }], + }, + ], + }, + { + name: job3[jobName3].stage, + groups: [ + { + name: jobName3, + jobs: [{ script: job3[jobName3].script, stage: job3[jobName3].stage }], + }, + ], + }, + ], + }; + + expect( + preparePipelineGraphData({ + stages: [userDefinedStage, userDefinedStageThatOverlaps], + ...job1, + ...job2, + ...job3, + ...job4, + }), + ).toEqual(expectedData); + }); + + it('with only unique values', () => { + const expectedData = { + stages: [ + { + name: job1[jobName1].stage, + groups: [ + { + name: jobName1, + jobs: [{ script: job1[jobName1].script, stage: job1[jobName1].stage }], + }, + ], + }, + ], + }; + + expect( + preparePipelineGraphData({ + stages: ['build'], + ...job1, + ...job1, + }), + ).toEqual(expectedData); + }); + }); +}); diff --git a/spec/graphql/types/merge_request_type_spec.rb b/spec/graphql/types/merge_request_type_spec.rb index 7272a952f77..46aebbdabeb 100644 --- a/spec/graphql/types/merge_request_type_spec.rb +++ b/spec/graphql/types/merge_request_type_spec.rb @@ -32,6 +32,8 @@ RSpec.describe GitlabSchema.types['MergeRequest'] do if Gitlab.ee? expected_fields << 'approved' + expected_fields << 'approvals_left' + expected_fields << 'approvals_required' expected_fields << 'approved_by' end diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb index b6a8ac31074..74360637897 100644 --- a/spec/lib/gitlab/auth_spec.rb +++ b/spec/lib/gitlab/auth_spec.rb @@ -358,6 +358,29 @@ RSpec.describe Gitlab::Auth, :use_clean_rails_memory_store_caching do .to eq(Gitlab::Auth::Result.new(nil, nil, nil, nil)) end end + + context 'when using a project access token' do + let_it_be(:project_bot_user) { create(:user, :project_bot) } + let_it_be(:project_access_token) { create(:personal_access_token, user: project_bot_user) } + + context 'with valid project access token' do + before_all do + project.add_maintainer(project_bot_user) + end + + it 'succeeds' do + expect(gl_auth.find_for_git_client(project_bot_user.username, project_access_token.token, project: project, ip: 'ip')) + .to eq(Gitlab::Auth::Result.new(project_bot_user, nil, :personal_access_token, described_class.full_authentication_abilities)) + end + end + + context 'with invalid project access token' do + it 'fails' do + expect(gl_auth.find_for_git_client(project_bot_user.username, project_access_token.token, project: project, ip: 'ip')) + .to eq(Gitlab::Auth::Result.new(nil, nil, nil, nil)) + end + end + end end context 'while using regular user and password' do diff --git a/spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb b/spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb index fad33265030..a23b74bcaca 100644 --- a/spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb +++ b/spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb @@ -327,6 +327,6 @@ RSpec.describe Gitlab::BackgroundMigration::BackfillSnippetRepositories, :migrat end def ls_files(snippet) - raw_repository(snippet).ls_files(nil) + raw_repository(snippet).ls_files(snippet.default_branch) end end diff --git a/spec/lib/gitlab/checks/snippet_check_spec.rb b/spec/lib/gitlab/checks/snippet_check_spec.rb index 2c027486bc9..037de8e9369 100644 --- a/spec/lib/gitlab/checks/snippet_check_spec.rb +++ b/spec/lib/gitlab/checks/snippet_check_spec.rb @@ -5,10 +5,12 @@ require 'spec_helper' RSpec.describe Gitlab::Checks::SnippetCheck do include_context 'change access checks context' - let(:snippet) { create(:personal_snippet, :repository) } - let(:user_access) { Gitlab::UserAccessSnippet.new(user, snippet: snippet) } + let_it_be(:snippet) { create(:personal_snippet, :repository) } - subject { Gitlab::Checks::SnippetCheck.new(changes, logger: logger) } + let(:user_access) { Gitlab::UserAccessSnippet.new(user, snippet: snippet) } + let(:default_branch) { snippet.default_branch } + + subject { Gitlab::Checks::SnippetCheck.new(changes, default_branch: default_branch, logger: logger) } describe '#validate!' do it 'does not raise any error' do @@ -39,5 +41,13 @@ RSpec.describe Gitlab::Checks::SnippetCheck do end end end + + context 'when default_branch is nil' do + let(:default_branch) { nil } + + it 'raises an error' do + expect { subject.validate! }.to raise_error(Gitlab::GitAccess::ForbiddenError, 'You can not create or delete branches.') + end + end end end diff --git a/spec/lib/gitlab/database/batch_count_spec.rb b/spec/lib/gitlab/database/batch_count_spec.rb index 1f84a915cdc..71d3666602f 100644 --- a/spec/lib/gitlab/database/batch_count_spec.rb +++ b/spec/lib/gitlab/database/batch_count_spec.rb @@ -9,12 +9,16 @@ RSpec.describe Gitlab::Database::BatchCount do let(:column) { :author_id } let(:in_transaction) { false } - let(:user) { create(:user) } - let(:another_user) { create(:user) } - before do + let_it_be(:user) { create(:user) } + let_it_be(:another_user) { create(:user) } + + before_all do create_list(:issue, 3, author: user) create_list(:issue, 2, author: another_user) + end + + before do allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(in_transaction) end diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index 7305db42f10..cb18fa88897 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -1064,6 +1064,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do 'p_analytics_repo' => 123, 'i_analytics_cohorts' => 123, 'i_analytics_dev_ops_score' => 123, + 'i_analytics_instance_statistics' => 123, 'p_analytics_merge_request' => 123, 'g_analytics_merge_request' => 123, 'analytics_unique_visits_for_any_target' => 543, diff --git a/spec/models/snippet_repository_spec.rb b/spec/models/snippet_repository_spec.rb index 0f5e0bfc75c..95602a4de0e 100644 --- a/spec/models/snippet_repository_spec.rb +++ b/spec/models/snippet_repository_spec.rb @@ -108,6 +108,7 @@ RSpec.describe SnippetRepository do before do allow(snippet).to receive(:repository).and_return(repo) allow(repo).to receive(:ls_files).and_return([]) + allow(repo).to receive(:root_ref).and_return('master') end it 'infers the commit action based on the parameters if not present' do @@ -197,7 +198,7 @@ RSpec.describe SnippetRepository do shared_examples 'snippet repository with file names' do |*filenames| it 'sets a name for unnamed files' do - ls_files = snippet.repository.ls_files(nil) + ls_files = snippet.repository.ls_files(snippet.default_branch) expect(ls_files).to include(*filenames) end end @@ -306,6 +307,6 @@ RSpec.describe SnippetRepository do end def first_blob(snippet) - snippet.repository.blob_at('master', snippet.repository.ls_files(nil).first) + snippet.repository.blob_at('master', snippet.repository.ls_files(snippet.default_branch).first) end end diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb index 79116a8a7df..ab614a6d45c 100644 --- a/spec/models/snippet_spec.rb +++ b/spec/models/snippet_spec.rb @@ -744,6 +744,16 @@ RSpec.describe Snippet do subject end + + context 'when ref is nil' do + let(:ref) { nil } + + it 'lists files from the repository from the deafult_branch' do + expect(snippet.repository).to receive(:ls_files).with(snippet.default_branch) + + subject + end + end end context 'when snippet does not have a repository' do diff --git a/spec/models/snippet_statistics_spec.rb b/spec/models/snippet_statistics_spec.rb index ad25bd7b3be..8def6a0bbd4 100644 --- a/spec/models/snippet_statistics_spec.rb +++ b/spec/models/snippet_statistics_spec.rb @@ -36,7 +36,7 @@ RSpec.describe SnippetStatistics do subject { statistics.update_file_count } it 'updates the count of files' do - file_count = snippet_with_repo.repository.ls_files(nil).count + file_count = snippet_with_repo.repository.ls_files(snippet_with_repo.default_branch).count subject diff --git a/spec/models/terraform/state_spec.rb b/spec/models/terraform/state_spec.rb index 68bb86bfa49..01ae80a61d1 100644 --- a/spec/models/terraform/state_spec.rb +++ b/spec/models/terraform/state_spec.rb @@ -7,8 +7,9 @@ RSpec.describe Terraform::State do let(:terraform_state_file) { fixture_file('terraform/terraform.tfstate') } - it { is_expected.to belong_to(:project) } + it { is_expected.to be_a FileStoreMounter } + it { is_expected.to belong_to(:project) } it { is_expected.to belong_to(:locked_by_user).class_name('User') } it { is_expected.to validate_presence_of(:project_id) } @@ -23,14 +24,6 @@ RSpec.describe Terraform::State do expect(subject.file.read).to eq(terraform_state_file) end end - - context 'when no file exists' do - subject { create(:terraform_state) } - - it 'creates a default file' do - expect(subject.file.read).to eq('{"version":1}') - end - end end describe '#file_store' do @@ -56,4 +49,55 @@ RSpec.describe Terraform::State do it_behaves_like 'mounted file in local store' end end + + describe '#latest_file' do + subject { terraform_state.latest_file } + + context 'versioning is enabled' do + let(:terraform_state) { create(:terraform_state, :with_version) } + let(:latest_version) { terraform_state.latest_version } + + it { is_expected.to eq latest_version.file } + + context 'but no version exists yet' do + let(:terraform_state) { create(:terraform_state) } + + it { is_expected.to be_nil } + end + end + + context 'versioning is disabled' do + let(:terraform_state) { create(:terraform_state, :with_file) } + + it { is_expected.to eq terraform_state.file } + end + end + + describe '#update_file!' do + let(:version) { 2 } + let(:data) { Hash[terraform_version: '0.12.21'].to_json } + + subject { terraform_state.update_file!(CarrierWaveStringFile.new(data), version: version) } + + context 'versioning is enabled' do + let(:terraform_state) { create(:terraform_state) } + + it 'creates a new version' do + expect { subject }.to change { Terraform::StateVersion.count } + + expect(terraform_state.latest_version.version).to eq(version) + expect(terraform_state.latest_version.file.read).to eq(data) + end + end + + context 'versioning is disabled' do + let(:terraform_state) { create(:terraform_state, :with_file) } + + it 'modifies the existing state record' do + expect { subject }.not_to change { Terraform::StateVersion.count } + + expect(terraform_state.latest_file.read).to eq(data) + end + end + end end diff --git a/spec/models/terraform/state_version_spec.rb b/spec/models/terraform/state_version_spec.rb new file mode 100644 index 00000000000..72dd29e1571 --- /dev/null +++ b/spec/models/terraform/state_version_spec.rb @@ -0,0 +1,76 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Terraform::StateVersion do + it { is_expected.to be_a FileStoreMounter } + + it { is_expected.to belong_to(:terraform_state).required } + it { is_expected.to belong_to(:created_by_user).class_name('User').optional } + + describe 'scopes' do + describe '.ordered_by_version_desc' do + let(:terraform_state) { create(:terraform_state) } + let(:versions) { [4, 2, 5, 1, 3] } + + subject { described_class.ordered_by_version_desc } + + before do + versions.each do |version| + create(:terraform_state_version, terraform_state: terraform_state, version: version) + end + end + + it { expect(subject.map(&:version)).to eq(versions.sort.reverse) } + end + end + + context 'file storage' do + subject { create(:terraform_state_version) } + + before do + stub_terraform_state_object_storage(Terraform::StateUploader) + end + + describe '#file' do + let(:terraform_state_file) { fixture_file('terraform/terraform.tfstate') } + + before do + subject.file = CarrierWaveStringFile.new(terraform_state_file) + subject.save! + end + + it 'returns the saved file' do + expect(subject.file.read).to eq(terraform_state_file) + end + end + + describe '#file_store' do + it 'returns the value' do + [ObjectStorage::Store::LOCAL, ObjectStorage::Store::REMOTE].each do |store| + subject.update!(file_store: store) + + expect(subject.file_store).to eq(store) + end + end + end + + describe '#update_file_store' do + context 'when file is stored in object storage' do + it 'sets file_store to remote' do + expect(subject.file_store).to eq(ObjectStorage::Store::REMOTE) + end + end + + context 'when file is stored locally' do + before do + stub_terraform_state_object_storage(enabled: false) + end + + it 'sets file_store to local' do + expect(subject.file_store).to eq(ObjectStorage::Store::LOCAL) + end + end + end + end +end diff --git a/spec/presenters/alert_management/alert_presenter_spec.rb b/spec/presenters/alert_management/alert_presenter_spec.rb index 7d0dbead7a0..243301502ce 100644 --- a/spec/presenters/alert_management/alert_presenter_spec.rb +++ b/spec/presenters/alert_management/alert_presenter_spec.rb @@ -65,12 +65,6 @@ RSpec.describe AlertManagement::AlertPresenter do **Description:** #{alert.description}#{markdown_line_break} **GitLab alert:** #{alert_url} - #### Alert Details - - **title:** Alert title#{markdown_line_break} - **start_time:** 2020-04-27T10:10:22.265949279Z#{markdown_line_break} - **custom.alert.fields:** ["one", "two"]#{markdown_line_break} - **yet.another:** 73 MARKDOWN ) end diff --git a/spec/presenters/projects/prometheus/alert_presenter_spec.rb b/spec/presenters/projects/prometheus/alert_presenter_spec.rb index 4f1b1931fb9..98dba28829e 100644 --- a/spec/presenters/projects/prometheus/alert_presenter_spec.rb +++ b/spec/presenters/projects/prometheus/alert_presenter_spec.rb @@ -65,9 +65,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do <<~MARKDOWN.chomp **Start time:** #{presenter.start_time} - #### Alert Details - - **startsAt:** #{presenter.starts_at_raw} MARKDOWN ) end @@ -96,17 +93,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do **Monitoring tool:** monitoring_tool_name#{markdown_line_break} **Hosts:** http://localhost:3000 http://localhost:3001 - #### Alert Details - - **annotations.hosts:** ["http://localhost:3000", "http://localhost:3001"]#{markdown_line_break} - **annotations.service:** service_name#{markdown_line_break} - **annotations.monitoring_tool:** monitoring_tool_name#{markdown_line_break} - **annotations.description:** Alert Description#{markdown_line_break} - **annotations.bar:** value2#{markdown_line_break} - **annotations.foo:** value1#{markdown_line_break} - **annotations.title:** Alert Title#{markdown_line_break} - **generatorURL:** http://host?g0.expr=query#{markdown_line_break} - **startsAt:** #{presenter.starts_at_raw} MARKDOWN ) end @@ -123,10 +109,6 @@ RSpec.describe Projects::Prometheus::AlertPresenter do **Start time:** #{presenter.start_time}#{markdown_line_break} **Hosts:** http://localhost:3000 - #### Alert Details - - **annotations.hosts:** http://localhost:3000#{markdown_line_break} - **startsAt:** #{presenter.starts_at_raw} MARKDOWN ) end diff --git a/spec/requests/api/terraform/state_spec.rb b/spec/requests/api/terraform/state_spec.rb index c47a12456c3..8d128bd911f 100644 --- a/spec/requests/api/terraform/state_spec.rb +++ b/spec/requests/api/terraform/state_spec.rb @@ -9,7 +9,7 @@ RSpec.describe API::Terraform::State do let_it_be(:developer) { create(:user, developer_projects: [project]) } let_it_be(:maintainer) { create(:user, maintainer_projects: [project]) } - let!(:state) { create(:terraform_state, :with_file, project: project) } + let!(:state) { create(:terraform_state, :with_version, project: project) } let(:current_user) { maintainer } let(:auth_header) { user_basic_auth_header(current_user) } @@ -42,7 +42,7 @@ RSpec.describe API::Terraform::State do request expect(response).to have_gitlab_http_status(:ok) - expect(response.body).to eq(state.file.read) + expect(response.body).to eq(state.reload.latest_file.read) end context 'for a project that does not exist' do @@ -63,7 +63,7 @@ RSpec.describe API::Terraform::State do request expect(response).to have_gitlab_http_status(:ok) - expect(response.body).to eq(state.file.read) + expect(response.body).to eq(state.reload.latest_file.read) end end end @@ -78,7 +78,7 @@ RSpec.describe API::Terraform::State do request expect(response).to have_gitlab_http_status(:ok) - expect(response.body).to eq(state.file.read) + expect(response.body).to eq(state.reload.latest_file.read) end it 'returns unauthorized if the the job is not running' do @@ -106,14 +106,14 @@ RSpec.describe API::Terraform::State do request expect(response).to have_gitlab_http_status(:ok) - expect(response.body).to eq(state.file.read) + expect(response.body).to eq(state.reload.latest_file.read) end end end end describe 'POST /projects/:id/terraform/state/:name' do - let(:params) { { 'instance': 'example-instance' } } + let(:params) { { 'instance': 'example-instance', 'serial': '1' } } subject(:request) { post api(state_path), headers: auth_header, as: :json, params: params } diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index af4becd980b..722e687838f 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -32,13 +32,6 @@ RSpec.describe UsersController, "routing" do expect(get("/users/User/snippets")).to route_to('users#snippets', username: 'User') end - # get all the ssh-keys of a user - it "to #get_keys" do - allow_any_instance_of(::Constraints::UserUrlConstrainer).to receive(:matches?).and_return(true) - - expect(get("/User.keys")).to route_to('users#ssh_keys', username: 'User') - end - it "to #calendar" do expect(get("/users/User/calendar")).to route_to('users#calendar', username: 'User') end @@ -193,6 +186,12 @@ RSpec.describe Profiles::KeysController, "routing" do it "to #destroy" do expect(delete("/profile/keys/1")).to route_to('profiles/keys#destroy', id: '1') end + + it "to #get_keys" do + allow_any_instance_of(::Constraints::UserUrlConstrainer).to receive(:matches?).and_return(true) + + expect(get("/foo.keys")).to route_to('profiles/keys#get_keys', username: 'foo') + end end # emails GET /emails(.:format) emails#index diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb index c7fa569c936..e09a7faece5 100644 --- a/spec/services/issues/create_service_spec.rb +++ b/spec/services/issues/create_service_spec.rb @@ -119,7 +119,7 @@ RSpec.describe Issues::CreateService do end it 'moves the issue to the end, in an asynchronous worker' do - expect(IssuePlacementWorker).to receive(:perform_async).with(Integer) + expect(IssuePlacementWorker).to receive(:perform_async).with(be_nil, Integer) described_class.new(project, user, opts).execute end diff --git a/spec/support/shared_examples/controllers/unique_visits_shared_examples.rb b/spec/support/shared_examples/controllers/unique_visits_shared_examples.rb index 90588756eb0..428389a9a01 100644 --- a/spec/support/shared_examples/controllers/unique_visits_shared_examples.rb +++ b/spec/support/shared_examples/controllers/unique_visits_shared_examples.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true RSpec.shared_examples 'tracking unique visits' do |method| + let(:request_params) { {} } + it 'tracks unique visit if the format is HTML' do expect_any_instance_of(Gitlab::Analytics::UniqueVisits).to receive(:track_visit).with(instance_of(String), target_id) diff --git a/spec/uploaders/terraform/versioned_state_uploader_spec.rb b/spec/uploaders/terraform/versioned_state_uploader_spec.rb new file mode 100644 index 00000000000..ecc3f943480 --- /dev/null +++ b/spec/uploaders/terraform/versioned_state_uploader_spec.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Terraform::VersionedStateUploader do + subject { model.file } + + let(:model) { create(:terraform_state_version, :with_file) } + + before do + stub_terraform_state_object_storage + end + + describe '#filename' do + it 'contains the UUID of the terraform state record' do + expect(subject.filename).to eq("#{model.version}.tfstate") + end + end + + describe '#store_dir' do + it 'hashes the project ID and UUID' do + expect(Gitlab::HashedPath).to receive(:new) + .with(model.uuid, root_hash: model.project_id) + .and_return(:store_dir) + + expect(subject.store_dir).to eq(:store_dir) + end + end +end diff --git a/spec/workers/issue_placement_worker_spec.rb b/spec/workers/issue_placement_worker_spec.rb index ee4cdae0fb9..5d4d41b90d0 100644 --- a/spec/workers/issue_placement_worker_spec.rb +++ b/spec/workers/issue_placement_worker_spec.rb @@ -9,83 +9,124 @@ RSpec.describe IssuePlacementWorker do let_it_be(:author) { create(:user) } let_it_be(:common_attrs) { { author: author, project: project } } let_it_be(:unplaced) { common_attrs.merge(relative_position: nil) } - let_it_be(:issue) { create(:issue, **unplaced, created_at: time) } - let_it_be(:issue_a) { create(:issue, **unplaced, created_at: time - 1.minute) } - let_it_be(:issue_b) { create(:issue, **unplaced, created_at: time - 2.minutes) } - let_it_be(:issue_c) { create(:issue, **unplaced, created_at: time + 1.minute) } - let_it_be(:issue_d) { create(:issue, **unplaced, created_at: time + 2.minutes) } - let_it_be(:issue_e) { create(:issue, **common_attrs, relative_position: 10, created_at: time + 1.minute) } - let_it_be(:issue_f) { create(:issue, **unplaced, created_at: time + 1.minute) } + let_it_be_with_reload(:issue) { create(:issue, **unplaced, created_at: time) } + let_it_be_with_reload(:issue_a) { create(:issue, **unplaced, created_at: time - 1.minute) } + let_it_be_with_reload(:issue_b) { create(:issue, **unplaced, created_at: time - 2.minutes) } + let_it_be_with_reload(:issue_c) { create(:issue, **unplaced, created_at: time + 1.minute) } + let_it_be_with_reload(:issue_d) { create(:issue, **unplaced, created_at: time + 2.minutes) } + let_it_be_with_reload(:issue_e) { create(:issue, **common_attrs, relative_position: 10, created_at: time + 1.minute) } + let_it_be_with_reload(:issue_f) { create(:issue, **unplaced, created_at: time + 1.minute) } let_it_be(:irrelevant) { create(:issue, relative_position: nil, created_at: time) } - it 'places all issues created at most 5 minutes before this one at the end, most recent last' do - expect do - described_class.new.perform(issue.id) - end.not_to change { irrelevant.reset.relative_position } + shared_examples 'running the issue placement worker' do + let(:issue_id) { issue.id } + let(:project_id) { project.id } - expect(project.issues.order_relative_position_asc) - .to eq([issue_e, issue_b, issue_a, issue, issue_c, issue_f, issue_d]) - expect(project.issues.where(relative_position: nil)).not_to exist - end - - it 'schedules rebalancing if needed' do - issue_a.update!(relative_position: RelativePositioning::MAX_POSITION) - - expect(IssueRebalancingWorker).to receive(:perform_async).with(nil, project.id) - - described_class.new.perform(issue.id) - end - - context 'there are more than QUERY_LIMIT unplaced issues' do - before_all do - # Ensure there are more than N issues in this set - n = described_class::QUERY_LIMIT - create_list(:issue, n - 5, **unplaced) - end - - it 'limits the sweep to QUERY_LIMIT records, and reschedules placement' do - expect(Issue).to receive(:move_nulls_to_end) - .with(have_attributes(count: described_class::QUERY_LIMIT)) - .and_call_original - - expect(described_class).to receive(:perform_async).with(issue_d.id) - - described_class.new.perform(issue.id) - - expect(project.issues.where(relative_position: nil)).to exist - end - - it 'is eventually correct' do - prefix = project.issues.where.not(relative_position: nil).order(:relative_position).to_a - moved = project.issues.where.not(id: prefix.map(&:id)) - - described_class.new.perform(issue.id) - - expect(project.issues.where(relative_position: nil)).to exist - - described_class.new.perform(issue.id) + it 'places all issues created at most 5 minutes before this one at the end, most recent last' do + expect { run_worker }.not_to change { irrelevant.reset.relative_position } + expect(project.issues.order_relative_position_asc) + .to eq([issue_e, issue_b, issue_a, issue, issue_c, issue_f, issue_d]) expect(project.issues.where(relative_position: nil)).not_to exist - expect(project.issues.order(:relative_position)).to eq(prefix + moved.order(:created_at, :id)) + end + + it 'schedules rebalancing if needed' do + issue_a.update!(relative_position: RelativePositioning::MAX_POSITION) + + expect(IssueRebalancingWorker).to receive(:perform_async).with(nil, project.id) + + run_worker + end + + context 'there are more than QUERY_LIMIT unplaced issues' do + before_all do + # Ensure there are more than N issues in this set + n = described_class::QUERY_LIMIT + create_list(:issue, n - 5, **unplaced) + end + + it 'limits the sweep to QUERY_LIMIT records, and reschedules placement' do + expect(Issue).to receive(:move_nulls_to_end) + .with(have_attributes(count: described_class::QUERY_LIMIT)) + .and_call_original + + expect(described_class).to receive(:perform_async).with(nil, project.id) + + run_worker + + expect(project.issues.where(relative_position: nil)).to exist + end + + it 'is eventually correct' do + prefix = project.issues.where.not(relative_position: nil).order(:relative_position).to_a + moved = project.issues.where.not(id: prefix.map(&:id)) + + run_worker + + expect(project.issues.where(relative_position: nil)).to exist + + run_worker + + expect(project.issues.where(relative_position: nil)).not_to exist + expect(project.issues.order(:relative_position)).to eq(prefix + moved.order(:created_at, :id)) + end + end + + context 'we are passed bad IDs' do + let(:issue_id) { non_existing_record_id } + let(:project_id) { non_existing_record_id } + + def max_positions_by_project + Issue + .group(:project_id) + .pluck(:project_id, Issue.arel_table[:relative_position].maximum.as('max_relative_position')) + .to_h + end + + it 'does move any issues to the end' do + expect { run_worker }.not_to change { max_positions_by_project } + end + + context 'the project_id refers to an empty project' do + let!(:project_id) { create(:project).id } + + it 'does move any issues to the end' do + expect { run_worker }.not_to change { max_positions_by_project } + end + end + end + + it 'anticipates the failure to place the issues, and schedules rebalancing' do + allow(Issue).to receive(:move_nulls_to_end) { raise RelativePositioning::NoSpaceLeft } + + expect(IssueRebalancingWorker).to receive(:perform_async).with(nil, project.id) + expect(Gitlab::ErrorTracking) + .to receive(:log_exception) + .with(RelativePositioning::NoSpaceLeft, worker_arguments) + + run_worker end end - it 'anticipates the failure to find the issue' do - id = non_existing_record_id + context 'passing an issue ID' do + def run_worker + described_class.new.perform(issue_id) + end - expect { described_class.new.perform(id) }.not_to raise_error + let(:worker_arguments) { { issue_id: issue_id, project_id: nil } } + + it_behaves_like 'running the issue placement worker' end - it 'anticipates the failure to place the issues, and schedules rebalancing' do - allow(Issue).to receive(:move_nulls_to_end) { raise RelativePositioning::NoSpaceLeft } + context 'passing a project ID' do + def run_worker + described_class.new.perform(nil, project_id) + end - expect(IssueRebalancingWorker).to receive(:perform_async).with(nil, project.id) - expect(Gitlab::ErrorTracking) - .to receive(:log_exception) - .with(RelativePositioning::NoSpaceLeft, issue_id: issue.id) + let(:worker_arguments) { { issue_id: nil, project_id: project_id } } - described_class.new.perform(issue.id) + it_behaves_like 'running the issue placement worker' end end end diff --git a/yarn.lock b/yarn.lock index 1b86922873e..dbb8685c18e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12419,6 +12419,11 @@ wbuf@^1.1.0, wbuf@^1.7.3: dependencies: minimalistic-assert "^1.0.0" +web-vitals@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-0.2.4.tgz#ec3df43c834a207fd7cdefd732b2987896e08511" + integrity sha512-6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg== + webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"