Skip to content

Commit 6a0143a

Browse files
Merge branch 'master' into crl/jira-paginated-project
2 parents 720019d + 59e26ba commit 6a0143a

File tree

554 files changed

+5967
-2297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

554 files changed

+5967
-2297
lines changed

.github/CODEOWNERS

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -521,23 +521,24 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
521521

522522

523523
## Issues
524-
**/issues/** @getsentry/issues
524+
# Catch-all
525+
**/issues/** @getsentry/issue-detection-backend @getsentry/issue-detection-frontend @getsentry/issues-workflow
526+
# Overrides
525527
/src/sentry/api/helpers/actionable_items_helper.py @getsentry/issues
526528
/src/sentry/api/helpers/events.py @getsentry/issues
527529
/src/sentry/api/helpers/group_index/ @getsentry/issues
528530
/src/sentry/api/helpers/source_map_helper.py @getsentry/issues
529-
/src/sentry/api/issue_search.py @getsentry/issues
530-
/src/sentry/api/endpoints/organization_pinned_searches.py @getsentry/issues
531+
/src/sentry/api/issue_search.py @getsentry/issues-workflow
532+
/src/sentry/api/endpoints/organization_pinned_searches.py @getsentry/issues-workflow
531533
/src/sentry/deletions/defaults/group.py @getsentry/issue-detection-backend
532534
/src/sentry/deletions/tasks/groups.py @getsentry/issue-detection-backend
533535
/src/sentry/event_manager.py @getsentry/issue-detection-backend
534536
/src/sentry/eventstore/models.py @getsentry/issue-detection-backend
535537
/src/sentry/grouping/ @getsentry/issue-detection-backend
536538
/src/sentry/mediators/ @getsentry/issues
537-
/src/sentry/ratelimits/ @getsentry/issues
538-
/src/sentry/search/events/builder/issue_platform.py @getsentry/issues
539-
/src/sentry/search/events/builder/errors.py @getsentry/issues
540-
/src/sentry/search/snuba/ @getsentry/issues
539+
/src/sentry/search/events/builder/issue_platform.py @getsentry/issues-workflow
540+
/src/sentry/search/events/builder/errors.py @getsentry/issues-workflow
541+
/src/sentry/search/snuba/ @getsentry/issues-workflow
541542
/src/sentry/seer/similarity/ @getsentry/issue-detection-backend
542543
/src/sentry/tasks/auto_ongoing_issues.py @getsentry/issue-detection-backend
543544
/src/sentry/tasks/auto_remove_inbox.py @getsentry/issue-detection-backend
@@ -557,23 +558,17 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
557558
/src/sentry/tasks/post_process.py @getsentry/issue-detection-backend
558559
/src/sentry/tasks/unmerge.py @getsentry/issue-detection-backend
559560
/src/sentry/tasks/weekly_escalating_forecast.py @getsentry/issue-detection-backend
560-
/static/app/components/events/contexts/ @getsentry/issues
561-
/static/app/components/events/eventTags/ @getsentry/issues
562-
/static/app/components/events/highlights/ @getsentry/issues
563-
/static/app/views/issueList @getsentry/issues
564-
/static/app/views/issueDetails/ @getsentry/issues
565-
/static/app/views/organizationStats/teamInsights/ @getsentry/issues
566-
/static/app/views/projects/ @getsentry/issues
567-
/static/app/views/projectDetail/ @getsentry/issues
568-
/static/app/views/settings/project/projectOwnership/ @getsentry/issues
569-
/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx @getsentry/issues
570-
/static/app/utils/analytics.tsx @getsentry/issues
571-
/static/app/utils/routeAnalytics/ @getsentry/issues
572-
/tests/sentry/api/test_issue_search.py @getsentry/issues
561+
/static/app/components/events/contexts/ @getsentry/issues-workflow
562+
/static/app/components/events/eventTags/ @getsentry/issues-workflow
563+
/static/app/components/events/highlights/ @getsentry/issues-workflow
564+
/static/app/views/issueList @getsentry/issues-workflow
565+
/static/app/views/issueDetails/ @getsentry/issues-workflow
566+
/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx @getsentry/issues-workflow
567+
/tests/sentry/api/test_issue_search.py @getsentry/issues-workflow
573568
/tests/sentry/deletions/test_group.py @getsentry/issue-detection-backend
574569
/tests/sentry/event_manager/ @getsentry/issue-detection-backend
575570
/tests/sentry/grouping/ @getsentry/issue-detection-backend
576-
/tests/sentry/search/ @getsentry/issues
571+
/tests/sentry/search/ @getsentry/issues-workflow
577572
/tests/sentry/tasks/test_auto_ongoing_issues.py @getsentry/issue-detection-backend
578573
/tests/sentry/tasks/test_auto_remove_inbox.py @getsentry/issue-detection-backend
579574
/tests/sentry/tasks/test_auto_resolve_issues.py @getsentry/issue-detection-backend
@@ -591,7 +586,7 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
591586
/tests/sentry/tasks/test_merge.py @getsentry/issue-detection-backend
592587
/tests/sentry/tasks/test_post_process.py @getsentry/issue-detection-backend
593588
/tests/sentry/tasks/test_weekly_escalating_forecast.py @getsentry/issue-detection-backend
594-
/tests/snuba/search/ @getsentry/issues
589+
/tests/snuba/search/ @getsentry/issues-workflow
595590
## End of Issues
596591

597592
## Billing

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ remote_subscriptions: 0003_drop_remote_subscription
2121

2222
replays: 0004_index_together
2323

24-
sentry: 0865_file_offsets
24+
sentry: 0866_grouptype_index
2525

2626
social_auth: 0002_default_auto_field
2727

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
"@sentry-internal/rrweb": "2.34.0",
5757
"@sentry-internal/rrweb-player": "2.34.0",
5858
"@sentry-internal/rrweb-snapshot": "2.34.0",
59-
"@sentry/browser": "9.11.0",
60-
"@sentry/core": "9.11.0",
61-
"@sentry/node": "9.11.0",
62-
"@sentry/react": "9.11.0",
59+
"@sentry/browser": "9.13.0",
60+
"@sentry/core": "9.13.0",
61+
"@sentry/node": "9.13.0",
62+
"@sentry/react": "9.13.0",
6363
"@sentry/release-parser": "^1.3.1",
6464
"@sentry/status-page-list": "^0.6.0",
6565
"@sentry/webpack-plugin": "^3.1.1",
@@ -68,7 +68,7 @@
6868
"@tanstack/react-query": "^5.72.1",
6969
"@tanstack/react-query-devtools": "^5.72.1",
7070
"@tanstack/react-query-persist-client": "^5.72.1",
71-
"@tanstack/react-virtual": "^3.5.1",
71+
"@tanstack/react-virtual": "^3.13.6",
7272
"@types/color": "^3.0.3",
7373
"@types/diff": "5.2.1",
7474
"@types/gtag.js": "^0.0.12",
@@ -113,6 +113,7 @@
113113
"echarts": "5.4.0",
114114
"echarts-for-react": "3.0.2",
115115
"esbuild": "^0.25.0",
116+
"flattie": "^1.1.1",
116117
"focus-trap": "^7.3.1",
117118
"fork-ts-checker-webpack-plugin": "^9.0.2",
118119
"framer-motion": "12.7.3",

requirements-base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ rfc3986-validator>=0.1.1
6868
sentry-arroyo>=2.21.0
6969
sentry-kafka-schemas>=1.2.0
7070
sentry-ophio==1.0.0
71-
sentry-protos==0.1.69
71+
sentry-protos==0.1.70
7272
sentry-redis-tools>=0.5.0
7373
sentry-relay>=0.9.8
7474
sentry-sdk[http2]>=2.25.1

requirements-dev-frozen.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ sentry-forked-djangorestframework-stubs==3.15.3.post1
189189
sentry-forked-email-reply-parser==0.5.12.post1
190190
sentry-kafka-schemas==1.2.0
191191
sentry-ophio==1.0.0
192-
sentry-protos==0.1.69
192+
sentry-protos==0.1.70
193193
sentry-redis-tools==0.5.0
194194
sentry-relay==0.9.8
195195
sentry-sdk==2.25.1

requirements-frozen.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ sentry-arroyo==2.21.0
127127
sentry-forked-email-reply-parser==0.5.12.post1
128128
sentry-kafka-schemas==1.2.0
129129
sentry-ophio==1.0.0
130-
sentry-protos==0.1.69
130+
sentry-protos==0.1.70
131131
sentry-redis-tools==0.5.0
132132
sentry-relay==0.9.8
133133
sentry-sdk==2.25.1

src/sentry/api/endpoints/organization_member_invite/details.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ def put(
9999
):
100100
return Response({"detail": MISSING_FEATURE_MESSAGE}, status=403)
101101

102+
if invited_member.partnership_restricted:
103+
return Response(
104+
{
105+
"detail": "This member is managed by an active partnership and cannot be modified until the end of the partnership."
106+
},
107+
status=403,
108+
)
109+
102110
allowed_roles = get_allowed_org_roles(request, organization)
103111
validator = OrganizationMemberInviteRequestValidator(
104112
data=request.data,

src/sentry/api/endpoints/organization_traces.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,13 +1922,16 @@ def process_rpc_user_queries(
19221922
config = SearchResolverConfig(auto_fields=True)
19231923
resolver = spans_rpc.get_resolver(snuba_params, config)
19241924

1925+
# Filter out empty queries as they do not do anything to change the results.
1926+
user_queries = [user_query for user_query in user_queries if len(user_query) > 0]
1927+
1928+
# ensure at least 1 user query exists as the environment filter is AND'ed to it
1929+
if not user_queries:
1930+
user_queries.append("")
1931+
19251932
for user_query in user_queries:
19261933
user_query = user_query.strip()
19271934

1928-
# Filter out empty queries as they do not do anything to change the results.
1929-
if not user_query:
1930-
continue
1931-
19321935
# We want to ignore all the aggregate conditions here because we're strictly
19331936
# searching on span attributes, not aggregates
19341937
where, _, _ = resolver.resolve_query(user_query)

src/sentry/api/serializers/rest_framework/organizationmemberinvite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def validate_orgRole(self, role):
9898
"You do not have permission to invite a member with that org-level role"
9999
)
100100
if (
101-
not features.has("organizations:team-roles", self.context["organization"])
101+
features.has("organizations:team-roles", self.context["organization"])
102102
and role_obj.is_retired
103103
):
104104
raise serializers.ValidationError(

src/sentry/features/temporary.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,6 @@ def register_temporary_features(manager: FeatureManager):
477477
manager.add("organizations:visibility-explore-tabs", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
478478
# Enable explore multi query page
479479
manager.add("organizations:explore-multi-query", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
480-
# Enabled unresolved issue webhook for organization
481-
manager.add("organizations:webhooks-unresolved", OrganizationFeature, FeatureHandlerStrategy.OPTIONS, api_expose=True)
482480
# Enable dual writing for issue alert issues (see: alerts create issues)
483481
manager.add("organizations:workflow-engine-issue-alert-dual-write", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
484482
# Enable workflow processing for metric issues

0 commit comments

Comments
 (0)