Merge branch 'master' into lzhao/ref/add-missing-renderers-to-default-function

Author: lzhao-sentry

.github/CODEOWNERS

@@ -114,10 +114,6 @@
             },
             "task": {
               "type": "integer"
-            },
-            "user": {
-              "type": "string",
-              "nullable": true
             }
           }
         }

api-docs/components/schemas/organization-details.json

@@ -97,12 +97,6 @@
     "/api/0/organizations/{organization_id_or_slug}/repos/": {
       "$ref": "paths/organizations/repos.json"
     },
-    "/api/0/organizations/{organization_id_or_slug}/repos/{repo_id}/commits/": {
-      "$ref": "paths/organizations/repo-commits.json"
-    },
-    "/api/0/organizations/{organization_id_or_slug}/shortids/{issue_id}/": {
-      "$ref": "paths/organizations/shortid.json"
-    },
     "/api/0/projects/": {
       "$ref": "paths/projects/index.json"
     },
@@ -166,9 +160,6 @@
     "/api/0/organizations/{organization_id_or_slug}/releases/{version}/commitfiles/": {
       "$ref": "paths/releases/organization-release-commit-files.json"
     },
-    "/api/0/organizations/{organization_id_or_slug}/releases/{version}/deploys/": {
-      "$ref": "paths/releases/deploys.json"
-    },
     "/api/0/organizations/{organization_id_or_slug}/sentry-app-installations/": {
       "$ref": "paths/integration-platform/sentry-app-installations.json"
     },

api-docs/openapi.json

@@ -5,6 +5,8 @@ ahead of you.
 To resolve this, rebase against latest master and regenerate your migration. This file
 will then be regenerated, and you should be able to merge without conflicts.
 
+discover: 0001_move_discover_models
+
 explore: 0005_explore_django_json_field
 
 feedback: 0001_squashed_0004_index_together
@@ -25,7 +27,7 @@ preprod: 0010_actual_drop_preprod_artifact_analysis_file_id_col
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 0941_create_temporary_verification_code_table
+sentry: 0945_move_discover_models
 
 social_auth: 0003_social_auth_json_field