Skip to content

Commit 8d62f17

Browse files
committed
Merge branch 'master' into feat/apm-v2
* master: (25 commits) 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) ref(ui): Move and codesplit `ProjectPlugins` (#13952) feat(typescript): Add TypeScript compatibility (#13786) ref(templates): Remove unused content block default (#14090) ref(less): Remove unused admin.less (#14097) ref(onobarding): Remove old onboarding experience (#14066) fix(ui) Fix missing conditions in tag bars (#14063) ref(suspect-commits): Add hook (#14057) ref(frontend): Segment frontend web urls (#14096) feat(suspect-commits): Add analytics events (#14080) feat(servicehooks): Update servicehook URLs (#14093) license: Remove license headers (#14095) ref(templates): Remove unused account_nav (#14091) fix: Disable transaction events in store (#14088) fix(InstallWizard): Fix exception when InstallWizard completed (#14092) ref(admin): Fix thrashing on stat charts (#14094) ...
2 parents 3a68e29 + cd49472 commit 8d62f17

File tree

385 files changed

+1887
-5266
lines changed

Some content is hidden

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

385 files changed

+1887
-5266
lines changed

package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,14 @@
2222
"@sentry/integrations": "5.6.0-beta.0",
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-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

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

src/sentry/api/bases/sentryapps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,12 @@ def has_object_permission(self, request, view, sentry_app):
160160
if sentry_app.owner not in request.user.get_orgs():
161161
raise Http404
162162

163+
# TODO(meredith): make a better way to allow for public
164+
# endpoints. we can't use ensure_scoped_permission now
165+
# that the public endpoint isn't denoted by '()'
166+
if sentry_app.is_published and request.method == 'GET':
167+
return True
168+
163169
return ensure_scoped_permission(
164170
request,
165171
self._scopes_for_sentry_app(sentry_app).get(request.method),

src/sentry/api/paginator.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
"""
2-
sentry.api.paginator
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 bisect

src/sentry/app.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
"""
2-
sentry.app
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
from threading import local

src/sentry/attachments/base.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
"""
2-
sentry.attachments.base
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-
"""
8-
91
from __future__ import absolute_import
102

113
import zlib

src/sentry/attachments/default.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
"""
2-
sentry.attachments.default
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-
"""
8-
91
from __future__ import absolute_import
102

113
from sentry.cache import default_cache

src/sentry/attachments/redis.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
"""
2-
sentry.attachments.redis
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-
"""
8-
91
from __future__ import absolute_import
102

113
import logging

0 commit comments

Comments
 (0)