From 2e3181a084845839809a38ec44f1e0856cd1159f Mon Sep 17 00:00:00 2001 From: Brian Samek Date: Tue, 18 Jun 2024 13:27:04 -0400 Subject: [PATCH] DEVPROD-5859 Remove Evergreen commit queue (#178) --- apps/spruce/.gitignore | 1 + .../projectSettings/defaulting_to_repo.ts | 7 -- .../projectSettings/repo_settings.ts | 32 +---- .../spruce/src/constants/externalResources.ts | 2 - .../projectSettings/githubCommitQueue.graphql | 6 - apps/spruce/src/gql/generated/types.ts | 87 ++------------ .../projectSettings/CopyProjectModal.test.tsx | 4 - .../tabs/EventLogTab/EventLogTab.test.tsx | 7 -- .../GithubCommitQueueTab/getFormSchema.tsx | 112 +----------------- .../GithubCommitQueueTab/transformers.test.ts | 27 +---- .../tabs/GithubCommitQueueTab/transformers.ts | 15 +-- .../tabs/GithubCommitQueueTab/types.ts | 10 +- .../pages/projectSettings/tabs/testData.ts | 7 -- 13 files changed, 18 insertions(+), 299 deletions(-) diff --git a/apps/spruce/.gitignore b/apps/spruce/.gitignore index ce409c02a..1456c27fa 100644 --- a/apps/spruce/.gitignore +++ b/apps/spruce/.gitignore @@ -19,6 +19,7 @@ env/.cmdrc.json .env.production.local .vscode node_modules +.tool-versions npm-debug.log* yarn-debug.log* diff --git a/apps/spruce/cypress/integration/projectSettings/defaulting_to_repo.ts b/apps/spruce/cypress/integration/projectSettings/defaulting_to_repo.ts index 569840eb3..b93e39129 100644 --- a/apps/spruce/cypress/integration/projectSettings/defaulting_to_repo.ts +++ b/apps/spruce/cypress/integration/projectSettings/defaulting_to_repo.ts @@ -162,13 +162,6 @@ describe("Project Settings when defaulting to repo", () => { cy.contains("Authorized Teams").should("not.exist"); }); - it("Displays the repo's merge method as its default", () => { - cy.get("button[name=merge-method-select]").should( - "have.text", - "Default to Repo (squash)", - ); - }); - it("Defaults to overriding repo since a patch definition is defined", () => { cy.dataCy("cq-override-radio-box") .find("input") diff --git a/apps/spruce/cypress/integration/projectSettings/repo_settings.ts b/apps/spruce/cypress/integration/projectSettings/repo_settings.ts index 4cfdafce4..aa552741f 100644 --- a/apps/spruce/cypress/integration/projectSettings/repo_settings.ts +++ b/apps/spruce/cypress/integration/projectSettings/repo_settings.ts @@ -117,10 +117,10 @@ describe("Repo Settings", () => { cy.dataCy("cq-card") .children() .as("cqCardFields") - .should("have.length", 2); + .should("have.length", 1); cy.get("@enableCQButton").click(); - cy.get("@cqCardFields").should("have.length", 4); + cy.get("@cqCardFields").should("have.length", 2); cy.contains("Commit Queue Patch Definitions").scrollIntoView(); cy.dataCy("error-banner") .contains( @@ -129,34 +129,13 @@ describe("Repo Settings", () => { .should("be.visible"); }); - it("Shows merge method only if merge queue is Evergreen", () => { - cy.get("@enableCQButton").click(); - // Evergreen is the default value - cy.getInputByLabel("Evergreen").should("be.checked"); - const selectId = "merge-method-select"; - cy.dataCy(selectId).as("mergeMethodDropdown").scrollIntoView(); - cy.dataCy(selectId).should("be.visible"); - // Click GitHub - cy.contains("label", "GitHub").click(); - cy.getInputByLabel("GitHub").should("be.checked"); - - // Hides merge method for GitHub. - cy.get("mergeMethodDropdown").should("not.exist"); - // Shows merge method for Evergreen. - cy.contains("label", "Evergreen").click(); - cy.getInputByLabel("Evergreen").should("be.checked"); - cy.get("@mergeMethodDropdown").should("be.visible"); - }); - it("Does not show override buttons for commit queue patch definitions", () => { cy.get("@enableCQButton").click(); - cy.getInputByLabel("Evergreen").should("be.checked"); cy.dataCy("cq-override-radio-box").should("not.exist"); }); - it("Saves a commit queue definition and uses the repo message as placeholder for a project setting ", () => { + it("Saves a commit queue definition", () => { cy.get("@enableCQButton").click(); - cy.dataCy("cq-message-input").type("Repo message wohoo!"); cy.contains("button", "Add Patch Definition").click(); cy.dataCy("variant-tags-input").first().type("vtag"); cy.dataCy("task-tags-input").first().type("ttag"); @@ -170,11 +149,6 @@ describe("Repo Settings", () => { cy.validateToast("success", "Successfully updated repo"); cy.visit(getGeneralRoute(projectUseRepoEnabled)); cy.dataCy("navitem-github-commitqueue").click(); - cy.dataCy("cq-message-input").should( - "have.attr", - "placeholder", - "Repo message wohoo! (Default from repo)", - ); }); }); }); diff --git a/apps/spruce/src/constants/externalResources.ts b/apps/spruce/src/constants/externalResources.ts index 43c0b8bf3..b1ce5d055 100644 --- a/apps/spruce/src/constants/externalResources.ts +++ b/apps/spruce/src/constants/externalResources.ts @@ -29,8 +29,6 @@ export const gitTagAliasesDocumentationUrl = `${projectDistroSettingsDocumentati export const githubChecksAliasesDocumentationUrl = `${projectDistroSettingsDocumentationUrl}#github-checks-aliases`; -export const githubMergeQueueDocumentationUrl = `${wikiBaseUrl}/Project-Configuration/Merge-Queue`; - export const ignoredFilesDocumentationUrl = `${wikiBaseUrl}/Project-Configuration/Project-Configuration-Files#ignoring-changes-to-certain-files`; export const cliDocumentationUrl = `${wikiBaseUrl}/CLI`; diff --git a/apps/spruce/src/gql/fragments/projectSettings/githubCommitQueue.graphql b/apps/spruce/src/gql/fragments/projectSettings/githubCommitQueue.graphql index 2409f0627..1a978f874 100644 --- a/apps/spruce/src/gql/fragments/projectSettings/githubCommitQueue.graphql +++ b/apps/spruce/src/gql/fragments/projectSettings/githubCommitQueue.graphql @@ -1,9 +1,6 @@ fragment ProjectGithubSettings on Project { commitQueue { enabled - mergeMethod - mergeQueue - message } githubChecksEnabled githubTriggerAliases @@ -18,9 +15,6 @@ fragment ProjectGithubSettings on Project { fragment RepoGithubSettings on RepoRef { commitQueue { enabled - mergeMethod - mergeQueue - message } githubChecksEnabled githubTriggerAliases diff --git a/apps/spruce/src/gql/generated/types.ts b/apps/spruce/src/gql/generated/types.ts index 2801a6d1a..cbb33bd52 100644 --- a/apps/spruce/src/gql/generated/types.ts +++ b/apps/spruce/src/gql/generated/types.ts @@ -3587,13 +3587,7 @@ export type ProjectGithubSettingsFragment = { manualPrTestingEnabled?: boolean | null; oldestAllowedMergeBase: string; prTestingEnabled?: boolean | null; - commitQueue: { - __typename?: "CommitQueueParams"; - enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null }; }; export type RepoGithubSettingsFragment = { @@ -3606,13 +3600,7 @@ export type RepoGithubSettingsFragment = { manualPrTestingEnabled: boolean; oldestAllowedMergeBase: string; prTestingEnabled: boolean; - commitQueue: { - __typename?: "RepoCommitQueueParams"; - enabled: boolean; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "RepoCommitQueueParams"; enabled: boolean }; }; export type ProjectGithubCommitQueueFragment = { @@ -3628,13 +3616,7 @@ export type ProjectGithubCommitQueueFragment = { manualPrTestingEnabled?: boolean | null; oldestAllowedMergeBase: string; prTestingEnabled?: boolean | null; - commitQueue: { - __typename?: "CommitQueueParams"; - enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null }; } | null; }; @@ -3651,13 +3633,7 @@ export type RepoGithubCommitQueueFragment = { manualPrTestingEnabled: boolean; oldestAllowedMergeBase: string; prTestingEnabled: boolean; - commitQueue: { - __typename?: "RepoCommitQueueParams"; - enabled: boolean; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "RepoCommitQueueParams"; enabled: boolean }; } | null; }; @@ -3674,13 +3650,7 @@ export type ProjectEventGithubCommitQueueFragment = { manualPrTestingEnabled?: boolean | null; oldestAllowedMergeBase: string; prTestingEnabled?: boolean | null; - commitQueue: { - __typename?: "CommitQueueParams"; - enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null }; } | null; }; @@ -3820,13 +3790,7 @@ export type ProjectSettingsFieldsFragment = { directory: string; }> | null; }; - commitQueue: { - __typename?: "CommitQueueParams"; - enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null }; } | null; subscriptions?: Array<{ __typename?: "GeneralSubscription"; @@ -4017,13 +3981,7 @@ export type RepoSettingsFieldsFragment = { directory: string; }> | null; }; - commitQueue: { - __typename?: "RepoCommitQueueParams"; - enabled: boolean; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "RepoCommitQueueParams"; enabled: boolean }; } | null; subscriptions?: Array<{ __typename?: "GeneralSubscription"; @@ -4404,13 +4362,7 @@ export type ProjectEventSettingsFragment = { directory: string; }> | null; }; - commitQueue: { - __typename?: "CommitQueueParams"; - enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null }; } | null; subscriptions?: Array<{ __typename?: "GeneralSubscription"; @@ -6865,9 +6817,6 @@ export type ProjectEventLogsQuery = { commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; }; } | null; subscriptions?: Array<{ @@ -7074,9 +7023,6 @@ export type ProjectEventLogsQuery = { commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; }; } | null; subscriptions?: Array<{ @@ -7362,9 +7308,6 @@ export type ProjectSettingsQuery = { commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; }; } | null; subscriptions?: Array<{ @@ -7619,9 +7562,6 @@ export type RepoEventLogsQuery = { commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; }; } | null; subscriptions?: Array<{ @@ -7828,9 +7768,6 @@ export type RepoEventLogsQuery = { commitQueue: { __typename?: "CommitQueueParams"; enabled?: boolean | null; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; }; } | null; subscriptions?: Array<{ @@ -8039,13 +7976,7 @@ export type RepoSettingsQuery = { directory: string; }> | null; }; - commitQueue: { - __typename?: "RepoCommitQueueParams"; - enabled: boolean; - mergeMethod: string; - mergeQueue: MergeQueue; - message: string; - }; + commitQueue: { __typename?: "RepoCommitQueueParams"; enabled: boolean }; } | null; subscriptions?: Array<{ __typename?: "GeneralSubscription"; diff --git a/apps/spruce/src/pages/projectSettings/CopyProjectModal.test.tsx b/apps/spruce/src/pages/projectSettings/CopyProjectModal.test.tsx index 168f82411..e8effa1c1 100644 --- a/apps/spruce/src/pages/projectSettings/CopyProjectModal.test.tsx +++ b/apps/spruce/src/pages/projectSettings/CopyProjectModal.test.tsx @@ -9,7 +9,6 @@ import { ProjectSettingsQueryVariables, RepoSettingsQuery, RepoSettingsQueryVariables, - MergeQueue, } from "gql/generated/types"; import { COPY_PROJECT } from "gql/mutations"; import { PROJECT_SETTINGS, REPO_SETTINGS } from "gql/queries"; @@ -371,9 +370,6 @@ const projectSettingsMock: ApolloMock< gitTagAuthorizedTeams: ["team"], commitQueue: { enabled: true, - mergeMethod: "squash", - mergeQueue: MergeQueue.Evergreen, - message: "", __typename: "CommitQueueParams", }, }, diff --git a/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx b/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx index 9f6b33a04..01df461e4 100644 --- a/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx +++ b/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx @@ -4,7 +4,6 @@ import { ProjectEventLogsQuery, ProjectEventLogsQueryVariables, ProjectHealthView, - MergeQueue, } from "gql/generated/types"; import { PROJECT_EVENT_LOGS } from "gql/queries"; import { renderWithRouterMatch as render, screen, waitFor } from "test_utils"; @@ -151,9 +150,6 @@ const projectEventsQuery: ProjectEventLogsQuery = { gitTagAuthorizedTeams: ["arst"], commitQueue: { enabled: true, - mergeMethod: "squash", - mergeQueue: MergeQueue.Evergreen, - message: "", __typename: "CommitQueueParams", }, parsleyFilters: [], @@ -238,9 +234,6 @@ const projectEventsQuery: ProjectEventLogsQuery = { gitTagAuthorizedTeams: ["evergreen"], commitQueue: { enabled: true, - mergeMethod: "squash", - mergeQueue: MergeQueue.Github, - message: "", __typename: "CommitQueueParams", }, parsleyFilters: [], diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getFormSchema.tsx b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getFormSchema.tsx index a583ed70c..e116a86c0 100644 --- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getFormSchema.tsx +++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getFormSchema.tsx @@ -8,13 +8,12 @@ import { pullRequestAliasesDocumentationUrl, gitTagAliasesDocumentationUrl, githubChecksAliasesDocumentationUrl, - githubMergeQueueDocumentationUrl, } from "constants/externalResources"; import { getProjectSettingsRoute, ProjectSettingsTabRoutes, } from "constants/routes"; -import { GithubProjectConflicts, MergeQueue } from "gql/generated/types"; +import { GithubProjectConflicts } from "gql/generated/types"; import { getTabTitle } from "pages/projectSettings/getTabTitle"; import { alias, form, ProjectType } from "../utils"; import { githubConflictErrorStyling, sectionHasError } from "./getErrors"; @@ -22,7 +21,7 @@ import { GithubTriggerAliasField } from "./GithubTriggerAliasField"; import { GCQFormState } from "./types"; const { aliasArray, aliasRowUiSchema, gitTagArray } = alias; -const { insertIf, overrideRadioBox, placeholderIf, radioBoxOptions } = form; +const { overrideRadioBox, placeholderIf, radioBoxOptions } = form; export const getFormSchema = ( identifier: string, @@ -215,10 +214,6 @@ export const getFormSchema = ( enabled: { enum: [false], }, - message: { - type: "string" as "string", - title: "Commit Queue Message", - }, }, }, { @@ -226,84 +221,6 @@ export const getFormSchema = ( enabled: { enum: [true], }, - message: { - type: "string" as "string", - title: "Commit Queue Message", - }, - mergeSettings: { - title: "Merge Queue", - type: "object" as "object", - properties: { - mergeQueue: { - type: "string" as "string", - title: "", - oneOf: [ - { - type: "string" as "string", - title: "GitHub", - enum: [MergeQueue.Github], - description: "GitHub's merge queue.", - }, - { - type: "string" as "string", - title: "Evergreen (deprecated)", - enum: [MergeQueue.Evergreen], - description: "Evergreen's commit queue.", - }, - ], - }, - }, - dependencies: { - mergeQueue: { - oneOf: [ - { - properties: { - mergeQueue: { - enum: [MergeQueue.Evergreen], - }, - mergeMethod: { - type: "string" as "string", - title: "Merge Method", - oneOf: [ - { - type: "string" as "string", - title: "Squash", - enum: ["squash"], - }, - { - type: "string" as "string", - title: "Merge", - enum: ["merge"], - }, - { - type: "string" as "string", - title: "Rebase", - enum: ["rebase"], - }, - ...insertIf( - projectType === - ProjectType.AttachedProject, - { - type: "string" as "string", - title: `Default to Repo (${repoData?.commitQueue?.mergeSettings?.mergeMethod})`, - enum: [""], - }, - ), - ], - }, - }, - }, - { - properties: { - mergeQueue: { - enum: [MergeQueue.Github], - }, - }, - }, - ], - }, - }, - }, patchDefinitions: { type: "object" as "object", title: "Commit Queue Patch Definitions", @@ -547,22 +464,6 @@ export const getFormSchema = ( "the Commit Queue", ), }, - message: { - "ui:description": "Shown in commit queue CLI commands & web UI", - "ui:data-cy": "cq-message-input", - // @ts-expect-error: FIXME. This comment was added by an automated script. - ...placeholderIf(repoData?.commitQueue?.message), - }, - mergeSettings: { - "ui:description": GitHubMergeQueueDescription, - mergeQueue: { - "ui:widget": "radio", - }, - mergeMethod: { - "ui:allowDeselect": false, - "ui:data-cy": "merge-method-select", - }, - }, patchDefinitions: { ...errorStyling( // @ts-expect-error: FIXME. This comment was added by an automated script. @@ -703,12 +604,3 @@ const GitHubChecksAliasesDescription = ( and no aliases are defined on the project or repo page. ); - -const GitHubMergeQueueDescription = ( - <> - Choose to merge with Evergreen or GitHub. Note that in order to use the - GitHub merge queue, you will need to complete the additional steps outlined - in the docs - . - -); diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.test.ts b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.test.ts index 26d85df4b..225dbe2c8 100644 --- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.test.ts +++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.test.ts @@ -1,8 +1,4 @@ -import { - ProjectSettingsInput, - RepoSettingsInput, - MergeQueue, -} from "gql/generated/types"; +import { ProjectSettingsInput, RepoSettingsInput } from "gql/generated/types"; import { data } from "../testData"; import { alias, ProjectType } from "../utils"; import { formToGql, gqlToForm, mergeProjectRepo } from "./transformers"; @@ -112,11 +108,6 @@ const projectForm: GCQFormState = { }, commitQueue: { enabled: null, - message: "", - mergeSettings: { - mergeMethod: "", - mergeQueue: MergeQueue.Evergreen, - }, patchDefinitions: { commitQueueAliasesOverride: true, commitQueueAliases: [ @@ -159,9 +150,6 @@ const projectResult: Pick< gitTagAuthorizedTeams: [], commitQueue: { enabled: null, - message: "", - mergeMethod: "", - mergeQueue: MergeQueue.Evergreen, }, }, aliases: [ @@ -273,11 +261,6 @@ const repoForm: GCQFormState = { }, commitQueue: { enabled: true, - message: "Commit Queue Message", - mergeSettings: { - mergeMethod: "squash", - mergeQueue: MergeQueue.Github, - }, patchDefinitions: { commitQueueAliasesOverride: true, commitQueueAliases: [], @@ -299,9 +282,6 @@ const repoResult: Pick = oldestAllowedMergeBase: "abc", commitQueue: { enabled: true, - message: "Commit Queue Message", - mergeMethod: "squash", - mergeQueue: MergeQueue.Github, }, }, aliases: [ @@ -430,11 +410,6 @@ const mergedForm: GCQFormState = { }, commitQueue: { enabled: null, - message: "", - mergeSettings: { - mergeMethod: "", - mergeQueue: MergeQueue.Evergreen, - }, patchDefinitions: { commitQueueAliasesOverride: true, commitQueueAliases: [ diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.ts index 682c7d185..ebdd7de8d 100644 --- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.ts +++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.ts @@ -108,11 +108,6 @@ export const gqlToForm = ((data, options) => { }, commitQueue: { enabled: commitQueue.enabled, - message: commitQueue.message, - mergeSettings: { - mergeQueue: commitQueue.mergeQueue, - mergeMethod: commitQueue.mergeMethod, - }, patchDefinitions: { commitQueueAliasesOverride: override(commitQueueAliases), commitQueueAliases, @@ -124,12 +119,7 @@ export const gqlToForm = ((data, options) => { export const formToGql = (( { - commitQueue: { - enabled, - mergeSettings: { mergeMethod, mergeQueue }, - message, - patchDefinitions, - }, + commitQueue: { enabled, patchDefinitions }, github: { gitTagVersionsEnabled, gitTags, @@ -162,9 +152,6 @@ export const formToGql = (( : null, commitQueue: { enabled, - mergeMethod, - mergeQueue, - message, }, }; diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/types.ts b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/types.ts index 102599b26..0918b9c75 100644 --- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/types.ts +++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/types.ts @@ -1,7 +1,4 @@ -import { - ProjectPatchAliasSettingsFragment, - MergeQueue, -} from "gql/generated/types"; +import { ProjectPatchAliasSettingsFragment } from "gql/generated/types"; import { AliasFormType, ProjectType } from "../utils"; export interface GCQFormState { @@ -55,11 +52,6 @@ export interface GCQFormState { }; commitQueue: { enabled: boolean | null; - message: string; - mergeSettings: { - mergeQueue: MergeQueue; - mergeMethod: string; - }; patchDefinitions: { commitQueueAliasesOverride: boolean; commitQueueAliases: Array; diff --git a/apps/spruce/src/pages/projectSettings/tabs/testData.ts b/apps/spruce/src/pages/projectSettings/tabs/testData.ts index 45f785e66..3e599ffc7 100644 --- a/apps/spruce/src/pages/projectSettings/tabs/testData.ts +++ b/apps/spruce/src/pages/projectSettings/tabs/testData.ts @@ -3,7 +3,6 @@ import { ProjectHealthView, ProjectSettingsQuery, RepoSettingsQuery, - MergeQueue, } from "gql/generated/types"; import { JiraTicketType } from "types/jira"; @@ -73,9 +72,6 @@ const projectBase: ProjectSettingsQuery["projectSettings"] = { gitTagAuthorizedTeams: [], commitQueue: { enabled: null, - mergeMethod: "", - mergeQueue: MergeQueue.Evergreen, - message: "", }, perfEnabled: true, buildBaronSettings: { @@ -210,9 +206,6 @@ const repoBase: RepoSettingsQuery["repoSettings"] = { gitTagAuthorizedTeams: [], commitQueue: { enabled: true, - mergeMethod: "squash", - mergeQueue: MergeQueue.Github, - message: "Commit Queue Message", }, perfEnabled: true, buildBaronSettings: {