Skip to content

Commit d60066b

Browse files
authored
Merge branch 'master' into ihbe/notification-settings-ux
2 parents 4de4c2a + 09ceea5 commit d60066b

File tree

535 files changed

+9569
-5783
lines changed

Some content is hidden

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

535 files changed

+9569
-5783
lines changed

.github/CODEOWNERS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@
5454
/src/sentry/api/authentication.py @getsentry/security @getsentry/enterprise
5555
/src/sentry/api/endpoints/auth* @getsentry/security @getsentry/enterprise
5656
/src/sentry/api/endpoints/user_permission* @getsentry/security @getsentry/enterprise
57+
/src/sentry/web/frontend/auth_close.py @getsentry/security
58+
/src/sentry/web/frontend/auth_login.py @getsentry/security
59+
/src/sentry/web/frontend/auth_logout.py @getsentry/security
60+
/src/sentry/web/frontend/auth_organization_id_login.py @getsentry/security
61+
/src/sentry/web/frontend/auth_organization_login.py @getsentry/security
62+
/src/sentry/web/frontend/auth_provider_login.py @getsentry/security
63+
/src/sentry/web/frontend/oauth_token.py @getsentry/security
64+
/src/sentry/web/frontend/oauth_authorize.py @getsentry/security
65+
/src/sentry/web/frontend/openidtoken.py @getsentry/security
5766

5867
## Dev
5968
/.github/ @getsentry/owners-sentry-dev

.github/workflows/stale.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[
2+
{
3+
"model": "sites.site",
4+
"pk": 1,
5+
"fields": {
6+
"domain": "example.com",
7+
"name": "example.com"
8+
}
9+
},
10+
{
11+
"model": "sentry.option",
12+
"pk": 1,
13+
"fields": {
14+
"key": "sentry:latest_version",
15+
"last_updated": "2023-06-22T00:00:00.000Z",
16+
"last_updated_by": "unknown",
17+
"value": "\"23.6.1\""
18+
}
19+
}
20+
]

fixtures/backup/fresh-install.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
"pk": 1,
167167
"fields": {
168168
"date_updated": "2023-06-22T23:00:00.123Z",
169-
"date_added": "2023-06-22T22:59:57.073Z",
169+
"date_added": "2023-06-22T22:59:57.000Z",
170170
"user": [
171171
172172
],
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
export function TeamReleaseCounts() {
2+
return {
3+
release_counts: {
4+
'2021-03-11': 1,
5+
'2021-03-12': 2,
6+
'2021-03-13': 1,
7+
'2021-03-14': 0,
8+
'2021-03-15': 0,
9+
'2021-03-16': 0,
10+
'2021-03-17': 0,
11+
'2021-03-18': 0,
12+
'2021-03-19': 0,
13+
'2021-03-20': 1,
14+
'2021-03-21': 0,
15+
'2021-03-22': 1,
16+
'2021-03-23': 0,
17+
'2021-03-24': 0,
18+
},
19+
project_avgs: {
20+
123: 3,
21+
234: 4,
22+
},
23+
last_week_totals: {
24+
123: 2,
25+
234: 4,
26+
},
27+
};
28+
}

fixtures/js-stubs/types.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ type OverridableStub<Params = any, Result = Params> = (
1515
params?: Partial<Params>
1616
) => Result;
1717

18+
type OverridableVariadicStub<Params = any, Result = Params> = (
19+
...params: Array<Partial<Params>>
20+
) => Result;
21+
1822
type OverridableStubList<Params = any, Result = Params> = (
1923
params?: Array<Partial<Params>>
2024
) => Result[];
@@ -42,6 +46,7 @@ type TestStubFixtures = {
4246
Commit: OverridableStub;
4347
CommitAuthor: OverridableStub;
4448
Config: OverridableStub;
49+
Dashboard: OverridableVariadicStub;
4550
DataScrubbingRelayPiiConfig: SimpleStub;
4651
DebugFile: OverridableStub;
4752
DebugSymbols: OverridableStub;
@@ -172,6 +177,7 @@ type TestStubFixtures = {
172177
TeamAlertsTriggered: SimpleStub;
173178
TeamIssuesBreakdown: SimpleStub;
174179
TeamIssuesReviewed: SimpleStub;
180+
TeamReleaseCounts: SimpleStub;
175181
TeamResolutionTime: SimpleStub;
176182
TeamRoleList: OverridableStub;
177183
Tombstones: OverridableStubList;
@@ -186,8 +192,8 @@ type TestStubFixtures = {
186192
VercelProvider: SimpleStub;
187193
VstsCreate: SimpleStub;
188194
VstsIntegrationProvider: OverridableStub;
189-
190195
VstsPlugin: SimpleStub;
196+
Widget: OverridableVariadicStub;
191197

192198
// TODO: These need propertly typed still
193199
// Widget(queries = {...DEFAULT_QUERIES}, options)

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ To resolve this, rebase against latest master and regenerate your migration. Thi
66
will then be regenerated, and you should be able to merge without conflicts.
77

88
nodestore: 0002_nodestore_no_dictfield
9-
sentry: 0510_index_checkin_traceid
9+
sentry: 0511_pickle_to_json_sentry_rawevent
1010
social_auth: 0001_initial

package.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
"@sentry-internal/react-inspector": "6.0.1-4",
5151
"@sentry-internal/rrweb": "1.108.0",
5252
"@sentry-internal/rrweb-player": "1.108.0",
53-
"@sentry/integrations": "^7.57.0",
54-
"@sentry/node": "^7.57.0",
53+
"@sentry/integrations": "^7.59.0-beta.0",
54+
"@sentry/node": "^7.59.0-beta.0",
5555
"@sentry/profiling-node": "^1.0.6",
56-
"@sentry/react": "^7.57.0",
56+
"@sentry/react": "^7.59.0-beta.0",
5757
"@sentry/release-parser": "^1.3.1",
58-
"@sentry/tracing": "^7.57.0",
59-
"@sentry/utils": "^7.57.0",
58+
"@sentry/tracing": "^7.59.0-beta.0",
59+
"@sentry/utils": "^7.59.0-beta.0",
6060
"@tanstack/react-query": "^4.29.7",
6161
"@types/color": "^3.0.3",
6262
"@types/crypto-js": "^4.1.1",
@@ -190,7 +190,6 @@
190190
"jest-canvas-mock": "^2.4.0",
191191
"jest-environment-jsdom": "^29.4.1",
192192
"jest-fail-on-console": "^3.0.2",
193-
"jest-fetch-mock": "^3.0.3",
194193
"jest-junit": "15.0.0",
195194
"jest-sentry-environment": "3.0.0",
196195
"postcss-jsx": "0.36.4",
@@ -209,6 +208,11 @@
209208
"fsevents": "^2.3.2"
210209
},
211210
"resolutions": {
211+
"**/@sentry/node": "^7.59.0-beta.0",
212+
"**/@sentry/hub": "^7.59.0-beta.0",
213+
"**/@sentry/core": "^7.59.0-beta.0",
214+
"**/@sentry/types": "^7.59.0-beta.0",
215+
"**/@sentry/utils": "^7.59.0-beta.0",
212216
"**/ua-parser-js": "<=0.7.28"
213217
},
214218
"APIMethod": "stub",

0 commit comments

Comments
 (0)