Skip to content

Commit f2e08ef

Browse files
committed
Merge branch 'master' into ref/relay-config-endpoint
* master: (115 commits) feat: Update to JS SDK 5.6.0-beta.1 + 0.10.2 sentry-python (#14116) fix(apm): Whitelist dev.getsentry.net for local development (#14117) test(datasets): Make Sentry use generic test functions in Snuba (#14111) ref(suspect-commits): Add text changes to empty state (#14121) build: Switch to psycopg2-binary feat(api): Add option to fetch Organization details without Pr… (#13925) ref: Remove EventDetails endpoint (#14107) test(ui): Mock the onboarding learn more video (#14108) tests(acceptance): Add tests for resolving issues in Issues Li… (#14069) feat(ui): Add basic templates for Incident Rules in settings (#14112) feat(eventsv2) Add basic transaction list (#14103) ref(environments) Optimize environment queries (#14102) fix(events-v2) Add additional user attributes to the user column (#14101) fix: Don't start pageload transaction (#14115) feat: APM Sentry Frontend (#14027) ref(onboarding): Fix install promprt URL (#14106) fix(app-platform): Allow GET requests for published apps (#14109) feat: Update Group.get_latest_event to use Snuba event (#14039) ref(onboarding): Rename wizardNew -> onboarding (#14104) feat(apm): Update props to address proptype warnings for new transaction attributes (SEN-800) (#14040) ...
2 parents 36c2f4d + e92e361 commit f2e08ef

File tree

656 files changed

+28504
-13096
lines changed

Some content is hidden

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

656 files changed

+28504
-13096
lines changed

.yarnrc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
yarn-path "./bin/yarn"
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
25
disable-self-update-check true
6+
lastUpdateCheck 1562193150687
7+
yarn-path "./bin/yarn"

README.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
<p align="center">
44
<p align="center">
5-
<img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" alt="Sentry" height="72"
5+
<a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
6+
<img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" alt="Sentry" height="72">
7+
</a>
68
</p>
79
<p align="center">
810
Users and logs provide clues. Sentry provides answers.

bin/yarn

Lines changed: 15056 additions & 4186 deletions
Large diffs are not rendered by default.

netlify.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
status = 200
2020
force = true
2121

22+
# Pass referer as sentry.io to avoid CSRF validation errors.
23+
headers = {Referer = "https://sentry.io/"}
24+
2225
[[redirects]]
2326
from = "/*"
2427
to = "/index.html"

package.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,18 @@
1818
"@babel/preset-react": "^7.0.0",
1919
"@babel/preset-typescript": "^7.3.3",
2020
"@babel/runtime": "^7.0.0",
21-
"@sentry/browser": "^5.4.2",
22-
"@sentry/integrations": "^5.4.2",
21+
"@sentry/browser": "5.6.0-beta.1",
22+
"@sentry/integrations": "5.6.0-beta.1",
2323
"@sentry/typescript": "^5.3.0",
2424
"@types/lodash": "^4.14.134",
25-
"@types/react-dom": "^16.8.4",
25+
"@types/moment-timezone": "^0.5.12",
26+
"@types/papaparse": "^4.5.11",
27+
"@types/react": "^16.7.0",
28+
"@types/react-bootstrap": "^0.32.19",
29+
"@types/react-document-title": "^2.0.3",
30+
"@types/react-dom": "^16.7.0",
31+
"@types/react-router": "^3.0.20",
32+
"@types/react-virtualized": "^9.20.1",
2633
"algoliasearch": "^3.32.0",
2734
"babel-core": "^7.0.0-bridge.0",
2835
"babel-loader": "^8.0.0",

requirements-base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ percy>=1.1.2
3737
petname>=2.0,<2.1
3838
Pillow>=3.2.0,<=4.2.1
3939
progressbar2>=3.10,<3.11
40-
psycopg2>=2.6.0,<2.8.0
40+
psycopg2-binary>=2.6.0,<2.8.0
4141
PyJWT>=1.5.0,<1.6.0
4242
pytest-django>=2.9.1,<2.10.0
4343
pytest-html>=1.9.0,<1.10.0
@@ -56,7 +56,7 @@ requests-oauthlib==0.3.3
5656
requests[security]>=2.20.0,<2.21.0
5757
selenium==3.141.0
5858
semaphore>=0.4.38,<0.5.0
59-
sentry-sdk>=0.10.0
59+
sentry-sdk>=0.10.2
6060
setproctitle>=1.1.7,<1.2.0
6161
simplejson>=3.2.0,<3.9.0
6262
six>=1.10.0,<1.11.0

requirements-test.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ pytest-timeout==1.2.1
66
pytest-xdist>=1.18.0,<1.19.0
77
responses>=0.8.1,<0.9.0
88
sqlparse==0.1.19
9+
werkzeug==0.15.5

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,20 @@ class SentrySDistCommand(SDistCommand):
9797

9898
class SentryBuildCommand(BuildCommand):
9999
def run(self):
100-
BuildCommand.run(self)
101100
if not IS_LIGHT_BUILD:
102101
self.run_command('build_integration_docs')
103102
self.run_command('build_assets')
104103
self.run_command('build_js_sdk_registry')
104+
BuildCommand.run(self)
105105

106106

107107
class SentryDevelopCommand(DevelopCommand):
108108
def run(self):
109-
DevelopCommand.run(self)
110109
if not IS_LIGHT_BUILD:
111110
self.run_command('build_integration_docs')
112111
self.run_command('build_assets')
113112
self.run_command('build_js_sdk_registry')
113+
DevelopCommand.run(self)
114114

115115

116116
cmdclass = {

src/sentry/__init__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
"""
2-
sentry
3-
~~~~~~
4-
5-
:copyright: (c) 2010-2014 by the Sentry Team, see AUTHORS for more details.
6-
:license: BSD, see LICENSE for more details.
7-
"""
81
from __future__ import absolute_import
92

103
import os

src/sentry/__main__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
"""
2-
sentry
3-
~~~~~~
4-
5-
:copyright: (c) 2015 by the Sentry Team, see AUTHORS for more details.
6-
:license: BSD, see LICENSE for more details.
7-
"""
81
from __future__ import absolute_import
92

103
from .runner import main

0 commit comments

Comments
 (0)