Fix things

Author: filiptronicek

components/gitpod-db/src/typeorm/migration/1736951418625-AddOrgSettingsCommitAnnotation.ts

@@ -8,7 +8,7 @@ import { MigrationInterface, QueryRunner } from "typeorm";
 import { columnExists } from "./helper/helper";
 
 const table = "d_b_org_settings";
-const newColumn = "annotateCommits";
+const newColumn = "annotateGitCommits";
 
 export class AddOrgSettingsCommitAnnotation1736951418625 implements MigrationInterface {
     public async up(queryRunner: QueryRunner): Promise<void> {

components/server/src/orgs/organization-service.ts

@@ -599,8 +599,8 @@ export class OrganizationService {
         if (settings.onboardingSettings) {
             result.onboardingSettings = settings.onboardingSettings;
         }
-        if (settings.annotateCommits) {
-            result.annotateCommits = settings.annotateCommits;
+        if (settings.annotateGitCommits) {
+            result.annotateGitCommits = settings.annotateGitCommits;
         }
 
         return result;

components/server/src/workspace/workspace-starter.ts

@@ -1562,6 +1562,12 @@ export class WorkspaceStarter {
             sysEnvvars.push(ev);
         }
 
+        const organizationSettings = await this.orgService.getSettings(user.id, workspace.organizationId);
+        organizationSettings.annotateGitCommits;
+        sysEnvvars.push(
+            newEnvVar("GITPOD_COMMIT_ANNOTATION_ENABLED", organizationSettings.annotateGitCommits ? "true" : "false"),
+        );
+
         const orgIdEnv = new EnvironmentVariable();
         orgIdEnv.setName("GITPOD_DEFAULT_WORKSPACE_IMAGE");
         orgIdEnv.setValue(await this.configProvider.getDefaultImage(workspace.organizationId));
@@ -1582,7 +1588,6 @@ export class WorkspaceStarter {
         sysEnvvars.push(isSetJavaXmx);
         sysEnvvars.push(isSetJavaProcessorCount);
         sysEnvvars.push(disableJetBrainsLocalPortForwarding);
-        sysEnvvars.push(newEnvVar("GITPOD_COMMIT_ANNOTATION_ENABLED", "true"));
         const spec = new StartWorkspaceSpec();
         await createGitpodTokenPromise;
         spec.setEnvvarsList(envvars);
@@ -1609,7 +1614,6 @@ export class WorkspaceStarter {
             spec.setTimeout(defaultTimeout);
             spec.setMaximumLifetime(workspaceLifetime);
             if (allowSetTimeout) {
-                const organizationSettings = await this.orgService.getSettings(user.id, workspace.organizationId);
                 if (organizationSettings.timeoutSettings?.inactivity) {
                     try {
                         const timeout = WorkspaceTimeoutDuration.validate(