fix merge conflicts

.env.example

@@ -50,6 +50,7 @@ AI_EMBEDDER_WORKERS='1'
 CDN_BASE_URL=''
 # FILE_STORE_PROVIDER: local | s3 | gcs
 FILE_STORE_PROVIDER='local'
+# Google Cloud credentials are required to use FILE_STORE_PROVIDER='gcs'
 # GOOGLE_GCS_BUCKET='BUCKET_NAME'
 
 # CHRONOS
@@ -97,9 +98,12 @@ REDIS_URL='redis://localhost:6379'
 # GOOGLE
 # Google Analytics Tracking ID
 # GA_TRACKING_ID=''
-# GOOGLE_CLOUD_CLIENT_EMAIL='key_GOOGLE_CLOUD_CLIENT_EMAIL'
-# GOOGLE_CLOUD_PRIVATE_KEY='key_GOOGLE_CLOUD_PRIVATE_KEY'
-# GOOGLE_CLOUD_PRIVATE_KEY_ID='key_GOOGLE_CLOUD_PRIVATE_KEY_ID'
+# GOOGLE_CLOUD_CLIENT_EMAIL=''
+# GOOGLE_CLOUD_PRIVATE_KEY=''
+# GOOGLE_CLOUD_PRIVATE_KEY_ID=''
+# Google Cloud credentials are required to use the GCP Natural Language API.
+# Disable Google Cloud Natural Language API for generating retro group titles
+# DISABLE_GOOGLE_CLOUD_NATURAL_LANGUAGE='true'
 
 # INTEGRATIONS
 # ATLASSIAN_CLIENT_ID='key_ATLASSIAN_CLIENT_ID'

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "8.6.1"
+  ".": "8.10.0"
 }

CHANGELOG.md

@@ -5,6 +5,75 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [8.10.0](https://github.com/ParabolInc/parabol/compare/v8.9.0...v8.10.0) (2024-12-10)
+
+
+### Added
+
+* GitLab voting to time estimate, weight or label ([#10549](https://github.com/ParabolInc/parabol/issues/10549)) ([1cdbf0b](https://github.com/ParabolInc/parabol/commit/1cdbf0b7b30da60b53cddf76076070b2a9a4edab))
+
+
+### Fixed
+
+* tasks in poker scoping ([#10563](https://github.com/ParabolInc/parabol/issues/10563)) ([d2b1ef8](https://github.com/ParabolInc/parabol/commit/d2b1ef8d2253100e518b78d10ee9bd36da969878))
+
+## [8.9.0](https://github.com/ParabolInc/parabol/compare/v8.8.0...v8.9.0) (2024-12-09)
+
+
+### Added
+
+* **node:** upgrade to 20.18.1, latest stable in v20 ([#10558](https://github.com/ParabolInc/parabol/issues/10558)) ([6061003](https://github.com/ParabolInc/parabol/commit/60610038cd30532e36330582a96454de5dbca122))
+
+
+### Changed
+
+* Use Logger instead of console ([#10557](https://github.com/ParabolInc/parabol/issues/10557)) ([31ce19b](https://github.com/ParabolInc/parabol/commit/31ce19bbfc21da7edb2b0d57df126a0d21f85930))
+
+## [8.8.0](https://github.com/ParabolInc/parabol/compare/v8.7.1...v8.8.0) (2024-12-03)
+
+
+### Added
+
+* use TipTap for the Check-in Question ([#10534](https://github.com/ParabolInc/parabol/issues/10534)) ([4787895](https://github.com/ParabolInc/parabol/commit/478789549e10495d5582f0db14e0e37fbb0e0b4d))
+
+
+### Changed
+
+* convert legacy tasks to TipTap ([#10533](https://github.com/ParabolInc/parabol/issues/10533)) ([561468c](https://github.com/ParabolInc/parabol/commit/561468cd68154820f11ced7887d4d4c0626efa8d))
+* remove teams limit ([#10514](https://github.com/ParabolInc/parabol/issues/10514)) ([908aba1](https://github.com/ParabolInc/parabol/commit/908aba1af7d7a7c804bc7db99f0e991b755a6347))
+
+## [8.7.1](https://github.com/ParabolInc/parabol/compare/v8.7.0...v8.7.1) (2024-12-02)
+
+
+### Fixed
+
+* parse draft discussions for csv ([#10540](https://github.com/ParabolInc/parabol/issues/10540)) ([3d9032e](https://github.com/ParabolInc/parabol/commit/3d9032e03860f57acd569048c1cae01351ccd301))
+
+## [8.7.0](https://github.com/ParabolInc/parabol/compare/v8.6.1...v8.7.0) (2024-12-02)
+
+
+### Added
+
+* TipTap Tasks add new line for jira tasks ([#10530](https://github.com/ParabolInc/parabol/issues/10530)) ([a8cfa03](https://github.com/ParabolInc/parabol/commit/a8cfa03ab9bbc259bcb3f5e6d01bad3ad86861a5))
+* Upgrade Task Editor to TipTap ([#10526](https://github.com/ParabolInc/parabol/issues/10526)) ([6a05e4b](https://github.com/ParabolInc/parabol/commit/6a05e4b025014df5b39e3b15a6dc5d1b8ddbb256))
+
+
+### Fixed
+
+* Add yarn pg:build to deployment steps in README ([#10508](https://github.com/ParabolInc/parabol/issues/10508)) ([1c1d17c](https://github.com/ParabolInc/parabol/commit/1c1d17cea15d38cf555590d60f0f396c24813df8))
+* show public teams ([#10537](https://github.com/ParabolInc/parabol/issues/10537)) ([c320ff5](https://github.com/ParabolInc/parabol/commit/c320ff57c35de01b3808b2d488a8efd87cb5d3b5))
+
+
+### Changed
+
+* clarify when Google Cloud credentials are required ([#10531](https://github.com/ParabolInc/parabol/issues/10531)) ([dfef8bb](https://github.com/ParabolInc/parabol/commit/dfef8bbda27d67b7cc2ba32fc7db2e95e58d23a6))
+* Make Google Language Manager optional ([#10535](https://github.com/ParabolInc/parabol/issues/10535)) ([99f0094](https://github.com/ParabolInc/parabol/commit/99f0094f14219024c32fa97b4139b813fd42e11b))
+* migrations renamed or deleted fail on migration-order GH action ([#10528](https://github.com/ParabolInc/parabol/issues/10528)) ([9dc1877](https://github.com/ParabolInc/parabol/commit/9dc1877f1d032c295e320009974e18ded40fecec))
+* release shareSummary ([#10511](https://github.com/ParabolInc/parabol/issues/10511)) ([ede3866](https://github.com/ParabolInc/parabol/commit/ede3866e8cbb570f2ae8dc068203a39355d58170))
+* remove ai template ([#10515](https://github.com/ParabolInc/parabol/issues/10515)) ([556ff3f](https://github.com/ParabolInc/parabol/commit/556ff3f0f20b2e991a9cc1e32b9a8b5bcc5997ea))
+* Rename Jira Server to Jira Data Center ([#10522](https://github.com/ParabolInc/parabol/issues/10522)) ([2e8346e](https://github.com/ParabolInc/parabol/commit/2e8346eec6897fc3fe4542d2bc5f36e63e7a3bf7))
+* use more detailed AI Summary for meetings ([#10501](https://github.com/ParabolInc/parabol/issues/10501)) ([b783f55](https://github.com/ParabolInc/parabol/commit/b783f558da5ca2bcad1b7e1412730b53243dc7af))
+
 ## [8.6.1](https://github.com/ParabolInc/parabol/compare/v8.6.0...v8.6.1) (2024-11-25)
 
 

package.json

@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "8.6.1",
+  "version": "8.10.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -13,7 +13,7 @@
     "url": "https://github.com/ParabolInc/parabol/issues"
   },
   "engines": {
-    "node": "^20.11.0",
+    "node": "^20.18.1",
     "yarn": "^1.22.5"
   },
   "private": true,

packages/chronos/chronos.ts

@@ -17,6 +17,7 @@
 
 import {CronJob} from 'cron'
 import getGraphQLExecutor from 'parabol-server/utils/getGraphQLExecutor'
+import {Logger} from 'parabol-server/utils/Logger'
 import publishWebhookGQL from 'parabol-server/utils/publishWebhookGQL'
 
 interface PossibleJob {
@@ -124,13 +125,13 @@ const chronos = () => {
         cronTime: cronTime!,
         onTick
       })
-      console.log(`🌱 Chronos Job ${name}: STARTED`)
+      Logger.log(`🌱 Chronos Job ${name}: STARTED`)
     } catch {
-      console.log(`🌱 Chronos Job ${name}: SKIPPED`)
+      Logger.log(`🌱 Chronos Job ${name}: SKIPPED`)
     }
   })
 
-  console.log(`\n🌾🌾🌾 Server ID: ${SERVER_ID}. Ready for Chronos           🌾🌾🌾`)
+  Logger.log(`\n🌾🌾🌾 Server ID: ${SERVER_ID}. Ready for Chronos           🌾🌾🌾`)
 }
 
 chronos()

packages/chronos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "8.6.1",
+  "version": "8.10.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -21,10 +21,10 @@
   },
   "devDependencies": {
     "@types/cron": "^2.0.1",
-    "@types/node": "^20.11.17"
+    "@types/node": "^20.14.8"
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "8.6.1"
+    "parabol-server": "8.10.0"
   }
 }

packages/client/components/EditGitHubLabelTemplateModal.tsx → packages/client/components/EditVotingLabelTemplateModal.tsx

@@ -70,7 +70,7 @@ const EditGitHubLabelTemplateModal = (props: Props) => {
   }
   return (
     <StyledDialogContainer>
-      <DialogTitle>{'Edit GitHub Label'}</DialogTitle>
+      <DialogTitle>{'Edit Label Template'}</DialogTitle>
       <DialogContent>
         <div>
           <LabelTemplateInput

packages/client/components/GitHubFieldDimensionDropdown.tsx

@@ -6,7 +6,7 @@ import {PALETTE} from '~/styles/paletteV3'
 import {GitHubFieldDimensionDropdown_stage$key} from '../__generated__/GitHubFieldDimensionDropdown_stage.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
-import interpolateGitHubLabelTemplate from '../shared/interpolateGitHubLabelTemplate'
+import interpolateVotingLabelTemplate from '../shared/interpolateVotingLabelTemplate'
 import {SprintPokerDefaults} from '../types/constEnums'
 import GitHubFieldMenu from './GitHubFieldMenu'
 import PlainButton from './PlainButton/PlainButton'
@@ -76,7 +76,7 @@ const GitHubFieldDimensionDropdown = (props: Props) => {
 
   const label =
     labelLookup[serviceFieldName as keyof typeof labelLookup] ||
-    interpolateGitHubLabelTemplate(serviceFieldName, finalScore)
+    interpolateVotingLabelTemplate(serviceFieldName, finalScore)
 
   return (
     <>

packages/client/components/GitHubFieldMenu.tsx

@@ -12,7 +12,7 @@ import textOverflow from '../styles/helpers/textOverflow'
 import {PALETTE} from '../styles/paletteV3'
 import {FONT_FAMILY} from '../styles/typographyV2'
 import {SprintPokerDefaults} from '../types/constEnums'
-import EditGitHubLabelTemplateModal from './EditGitHubLabelTemplateModal'
+import EditVotingLabelTemplateModal from './EditVotingLabelTemplateModal'
 import FlatButton from './FlatButton'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
@@ -186,7 +186,7 @@ const GitHubFieldMenu = (props: Props) => {
         />
       </Menu>
       {modalPortal(
-        <EditGitHubLabelTemplateModal
+        <EditVotingLabelTemplateModal
           updateLabelTemplate={handleClick}
           closePortal={closeModal}
           defaultValue={serviceFieldTemplate}

packages/client/components/GitLabFieldDimensionDropdown.tsx

@@ -6,6 +6,7 @@ import {PALETTE} from '~/styles/paletteV3'
 import {GitLabFieldDimensionDropdown_stage$key} from '../__generated__/GitLabFieldDimensionDropdown_stage.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
+import interpolateVotingLabelTemplate from '../shared/interpolateVotingLabelTemplate'
 import {SprintPokerDefaults} from '../types/constEnums'
 import GitLabFieldMenu from './GitLabFieldMenu'
 import PlainButton from './PlainButton/PlainButton'
@@ -39,6 +40,9 @@ const StyledIcon = styled(ExpandMore)<{isFacilitator: boolean}>(({isFacilitator}
 }))
 
 const labelLookup = {
+  [SprintPokerDefaults.GITLAB_FIELD_TIME_ESTIMATE]:
+    SprintPokerDefaults.GITLAB_FIELD_TIME_ESTIMATE_LABEL,
+  [SprintPokerDefaults.GITLAB_FIELD_WEIGHT]: SprintPokerDefaults.GITLAB_FIELD_WEIGHT_LABEL,
   [SprintPokerDefaults.SERVICE_FIELD_COMMENT]: SprintPokerDefaults.SERVICE_FIELD_COMMENT_LABEL,
   [SprintPokerDefaults.SERVICE_FIELD_NULL]: SprintPokerDefaults.SERVICE_FIELD_NULL_LABEL
 }
@@ -57,11 +61,14 @@ const GitLabFieldDimensionDropdown = (props: Props) => {
     `,
     stageRef
   )
-  const {serviceField} = stage
+  const {finalScore, serviceField} = stage
   const {name: serviceFieldName} = serviceField
   const {togglePortal, menuPortal, originRef, menuProps} = useMenu<HTMLButtonElement>(
     MenuPosition.UPPER_RIGHT,
-    {isDropdown: true}
+    {
+      isDropdown: true,
+      id: 'gitlabFieldMenu'
+    }
   )
 
   const onClick = () => {
@@ -70,7 +77,9 @@ const GitLabFieldDimensionDropdown = (props: Props) => {
     clearError()
   }
 
-  const label = labelLookup[serviceFieldName as keyof typeof labelLookup]
+  const label =
+    labelLookup[serviceFieldName as keyof typeof labelLookup] ||
+    interpolateVotingLabelTemplate(serviceFieldName, finalScore)
 
   return (
     <>