fix options

Author: cathteng

src/sentry/api/serializers/models/organization.py

@@ -542,7 +542,6 @@ class DetailedOrganizationSerializerResponse(_DetailedOrganizationSerializerResp
     githubPRBot: bool
     githubNudgeInvite: bool
     gitlabPRBot: bool
-    gitlabOpenPRBot: bool
     aggregatedDataConsent: bool
     genAIConsent: bool
     isDynamicallySampled: bool
@@ -665,9 +664,6 @@ def serialize(  # type: ignore[override]
                 obj.get_option("sentry:github_nudge_invite", GITHUB_COMMENT_BOT_DEFAULT)
             ),
             "gitlabPRBot": bool(obj.get_option("sentry:gitlab_pr_bot", GITLAB_COMMENT_BOT_DEFAULT)),
-            "gitlabOpenPRBot": bool(
-                obj.get_option("sentry:gitlab_open_pr_bot", GITLAB_COMMENT_BOT_DEFAULT)
-            ),
             "genAIConsent": bool(
                 obj.get_option("sentry:gen_ai_consent_v2024_11_14", DATA_CONSENT_DEFAULT)
             ),

src/sentry/apidocs/examples/organization_examples.py

@@ -290,10 +290,9 @@ class OrganizationExamples:
                 "relayPiiConfig": None,
                 "codecovAccess": False,
                 "hideAiFeatures": False,
-                "githubPRBot": True,
+                "githubPRBot": False,
                 "githubNudgeInvite": True,
-                "gitlabPRBot": True,
-                "gitlabOpenPRBot": True,
+                "gitlabPRBot": False,
                 "aggregatedDataConsent": False,
                 "defaultAutofixAutomationTuning": AutofixAutomationTuningSettings.OFF,
                 "defaultSeerScannerAutomation": True,

src/sentry/core/endpoints/organization_details.py

@@ -194,12 +194,6 @@
         bool,
         GITLAB_COMMENT_BOT_DEFAULT,
     ),
-    (
-        "gitlabOpenPRBot",
-        "sentry:gitlab_open_pr_bot",
-        bool,
-        GITLAB_COMMENT_BOT_DEFAULT,
-    ),
     (
         "issueAlertsThreadFlag",
         "sentry:issue_alerts_thread_flag",
@@ -307,7 +301,6 @@ class OrganizationSerializer(BaseOrganizationSerializer):
     githubNudgeInvite = serializers.BooleanField(required=False)
     githubPRBot = serializers.BooleanField(required=False)
     gitlabPRBot = serializers.BooleanField(required=False)
-    gitlabOpenPRBot = serializers.BooleanField(required=False)
     issueAlertsThreadFlag = serializers.BooleanField(required=False)
     metricAlertsThreadFlag = serializers.BooleanField(required=False)
     require2FA = serializers.BooleanField(required=False)
@@ -894,10 +887,6 @@ class OrganizationDetailsPutSerializer(serializers.Serializer):
         help_text="Specify `true` to allow Sentry to comment on recent pull requests suspected of causing issues. Requires a GitLab integration.",
         required=False,
     )
-    gitlabOpenPRBot = serializers.BooleanField(
-        help_text="Specify `true` to allow Sentry to comment on open pull requests to show recent error issues for the code being changed. Requires a GitLab integration.",
-        required=False,
-    )
 
     # slack features
     issueAlertsThreadFlag = serializers.BooleanField(

tests/sentry/core/endpoints/test_organization_details.py

@@ -755,10 +755,9 @@ def test_various_options(self, mock_get_repositories: MagicMock) -> None:
             "allowSuperuserAccess": False,
             "allowMemberInvite": False,
             "hideAiFeatures": True,
-            "githubNudgeInvite": False,
-            "githubPRBot": False,
-            "gitlabPRBot": False,
-            "gitlabOpenPRBot": False,
+            "githubNudgeInvite": True,
+            "githubPRBot": True,
+            "gitlabPRBot": True,
             "allowSharedIssues": False,
             "enhancedPrivacy": True,
             "dataScrubber": True,
@@ -851,7 +850,6 @@ def test_various_options(self, mock_get_repositories: MagicMock) -> None:
         assert "to {}".format(data["githubPRBot"]) in log.data["githubPRBot"]
         assert "to {}".format(data["githubNudgeInvite"]) in log.data["githubNudgeInvite"]
         assert "to {}".format(data["gitlabPRBot"]) in log.data["gitlabPRBot"]
-        assert "to {}".format(data["gitlabOpenPRBot"]) in log.data["gitlabOpenPRBot"]
         assert "to {}".format(data["issueAlertsThreadFlag"]) in log.data["issueAlertsThreadFlag"]
         assert "to {}".format(data["metricAlertsThreadFlag"]) in log.data["metricAlertsThreadFlag"]
         assert "to Default Mode" in log.data["samplingMode"]