Merge branch 'master' into feat/ui-debug-sources

* master:
  chore: Fix typo errywhere -> everywhere (#13934)
  ref: (Django 1.9) Bump djangorestframework to 3.0.5 as an intermediate step to get to 3.3.x
  feat(issueless events): Test eventstream work without groups (#13888)
  ref: Improve repr of User (#13896)
  feat(loader): Make the default for new js projects v5 of js sdk (#13327)
  build: Remove browser-reload flag (#13918)
  ref(ui): Consolidate server frontend hydration logic (#13868)
  ref: Refactor user reports to not use Postgres Event (#13904)
  Test/integration acceptance tests (#13895)
  feat: Remove ts-jest (#13846)
  obs(sentry_apps): Add a small metrics increment on processing resource changes. (#13897)
  enable testing for all orgs (#13903)
  ref: Update Python SDK to 0.10.0 (#13911)
  fix: Do not suggest Sentry.Extensions.Logging when ASP.NET Core is used (#13891)
  Update license year to 2019
  ci(travis): Move docker-sentry builds to Dockes Hub autobuild (#13901)
  ref(app-platform): Add integration features to SentryAppDetailsModal (#13393)
  chore(ui) Rename OrganizationStream to IssueList (#13892)

Author: jan-auer

.travis.yml

@@ -65,25 +65,8 @@ after_script:
   # Trigger a build for the `git` image on docker-sentry
   - >
       if [ "$TRAVIS_PULL_REQUEST" == "false" -a "$TRAVIS_BRANCH" == "master" ]; then
-      curl -s -X POST
-      -H "Content-Type: application/json"
-      -H "Accept: application/json"
-      -H "Travis-API-Version: 3"
-      -H "Authorization: token $TRAVIS_TOKEN"
-      -d '{
-        "request": {
-          "branch": "master",
-          "config": {
-            "env": {
-              "matrix": [
-                "VERSION=git"
-              ]
-            }
-          },
-          "message": "Build for getsentry/sentry@'"$TRAVIS_COMMIT"'"
-        }
-      }'
-      https://api.travis-ci.org/repo/getsentry%2Fdocker-sentry/requests
+        curl -s -X POST "$DOCKER_SENTRY_BUILD_TRIGGER_URL";
+      fi
 
 base_postgres: &postgres_default
   python: 2.7
@@ -137,6 +120,7 @@ matrix:
       name: 'Linter'
       env: TEST_SUITE=lint
       install:
+        - python setup.py install_egg_info
         - SENTRY_LIGHT_BUILD=1 pip install -U -e ".[dev,tests,optional]"
         - find "$NODE_DIR" -type d -empty -delete
         - nvm install

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Sentry (https://sentry.io) and individual contributors.
+Copyright (c) 2019 Sentry (https://sentry.io) and individual contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

babel.config.js

@@ -1,6 +1,6 @@
 /*eslint-env node*/
 module.exports = {
-  presets: ['@babel/react', '@babel/env'],
+  presets: ['@babel/react', '@babel/env', '@babel/preset-typescript'],
   plugins: [
     'emotion',
     'lodash',

jest.config.js

@@ -29,13 +29,8 @@ module.exports = {
   ],
   transform: {
     '^.+\\.jsx?$': 'babel-jest',
-    '^.+\\.tsx?$': 'ts-jest',
+    '^.+\\.tsx?$': 'babel-jest',
   },
   moduleFileExtensions: ['js', 'ts', 'jsx', 'tsx'],
-  globals: {
-    'ts-jest': {
-      tsConfig: './tsconfig.json',
-      diagnostics: false,
-    },
-  },
+  globals: {},
 };

package.json

@@ -16,6 +16,7 @@
     "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
+    "@babel/preset-typescript": "^7.3.3",
     "@babel/runtime": "^7.0.0",
     "@sentry/browser": "^5.4.2",
     "@sentry/integrations": "^5.4.2",
@@ -131,7 +132,6 @@
     "stylelint-config-recommended": "^2.1.0",
     "stylelint-config-styled-components": "^0.1.1",
     "stylelint-processor-styled-components": "^1.3.0",
-    "ts-jest": "^24.0.2",
     "tsconfig-paths-webpack-plugin": "^3.2.0",
     "webpack-dev-server": "^3.1.10"
   },
@@ -148,7 +148,7 @@
     "test-staged": "yarn test --findRelatedTests $(git diff --name-only --cached)",
     "lint": "node_modules/.bin/eslint tests/js src/sentry/static/sentry/app --ext .js,.jsx,.ts,.tsx",
     "lint:css": "stylelint 'src/sentry/static/sentry/app/**/*.jsx'",
-    "dev": "(yarn check --verify-tree || yarn install --check-files) && sentry devserver --browser-reload",
+    "dev": "(yarn check --verify-tree || yarn install --check-files) && sentry devserver",
     "dev-server": "webpack-dev-server",
     "storybook": "start-storybook -p 9001 -c .storybook",
     "storybook-build": "build-storybook -c .storybook -o .storybook-out && sed -i -e 's/\\/sb_dll/sb_dll/g' .storybook-out/index.html",

requirements-base.txt

@@ -12,7 +12,7 @@ django-jsonfield>=0.9.13,<0.9.14
 django-picklefield>=0.3.0,<1.1.0
 django-sudo>=2.1.0,<3.0.0
 Django>=1.8,<1.9
-djangorestframework>=2.4.8,<2.5.0
+djangorestframework==3.0.5
 email-reply-parser>=0.2.0,<0.3.0
 enum34>=1.1.6,<1.2.0
 exam>=0.5.1
@@ -56,7 +56,7 @@ requests-oauthlib==0.3.3
 requests[security]>=2.20.0,<2.21.0
 selenium==3.141.0
 semaphore>=0.4.38,<0.5.0
-sentry-sdk>=0.9.0
+sentry-sdk>=0.10.0
 setproctitle>=1.1.7,<1.2.0
 simplejson>=3.2.0,<3.9.0
 six>=1.10.0,<1.11.0

src/sentry/api/bases/avatar.py

@@ -59,7 +59,7 @@ def put(self, request, **kwargs):
         if not serializer.is_valid():
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
-        result = serializer.object
+        result = serializer.validated_data
 
         self.model.save_avatar(
             relation={self.object_type: obj},

src/sentry/api/bases/discoversavedquery.py

@@ -10,20 +10,19 @@ class DiscoverSavedQuerySerializer(serializers.Serializer):
     projects = ListField(
         child=serializers.IntegerField(),
         required=False,
-        allow_null=True,
         default=[]
     )
-    start = serializers.DateTimeField(required=False)
-    end = serializers.DateTimeField(required=False)
-    range = serializers.CharField(required=False, allow_none=True)
+    start = serializers.DateTimeField(required=False, allow_null=True)
+    end = serializers.DateTimeField(required=False, allow_null=True)
+    range = serializers.CharField(required=False, allow_null=True)
     fields = ListField(
         child=serializers.CharField(),
         required=False,
         allow_null=True,
     )
-    limit = serializers.IntegerField(min_value=0, max_value=1000, required=False)
-    rollup = serializers.IntegerField(required=False)
-    orderby = serializers.CharField(required=False)
+    limit = serializers.IntegerField(min_value=0, max_value=1000, required=False, allow_null=True)
+    rollup = serializers.IntegerField(required=False, allow_null=True)
+    orderby = serializers.CharField(required=False, allow_null=True)
     conditions = ListField(
         child=ListField(),
         required=False,
@@ -32,7 +31,6 @@ class DiscoverSavedQuerySerializer(serializers.Serializer):
     aggregations = ListField(
         child=ListField(),
         required=False,
-        allow_null=True,
         default=[]
     )
     groupby = ListField(
@@ -41,9 +39,8 @@ class DiscoverSavedQuerySerializer(serializers.Serializer):
         allow_null=True,
     )
 
-    def validate_projects(self, attrs, source):
+    def validate_projects(self, projects):
         organization = self.context['organization']
-        projects = attrs[source]
 
         org_projects = set(Project.objects.filter(
             organization=organization,
@@ -54,7 +51,7 @@ def validate_projects(self, attrs, source):
         if set(projects) != org_projects:
             raise PermissionDenied
 
-        return attrs
+        return projects
 
     def validate(self, data):
         query = {}

src/sentry/api/bases/project.py

@@ -152,9 +152,9 @@ def convert_args(self, request, organization_slug, project_slug, *args, **kwargs
     def handle_exception(self, request, exc):
         if isinstance(exc, ProjectMoved):
             response = Response({
-                'slug': exc.detail['extra']['slug'],
-                'detail': exc.detail
+                'slug': exc.detail['detail']['extra']['slug'],
+                'detail': exc.detail['detail']
             }, status=exc.status_code)
-            response['Location'] = exc.detail['extra']['url']
+            response['Location'] = exc.detail['detail']['extra']['url']
             return response
         return super(ProjectEndpoint, self).handle_exception(request, exc)

src/sentry/api/bases/sentryapps.py

@@ -131,9 +131,10 @@ def has_object_permission(self, request, view, sentry_app):
         if is_active_superuser(request):
             return True
 
-        # User must be in the Org who owns the app.
-        if sentry_app.owner not in request.user.get_orgs():
-            raise Http404
+        # if app is unpublished, user must be in the Org who owns the app.
+        if not sentry_app.is_published:
+            if sentry_app.owner not in request.user.get_orgs():
+                raise Http404
 
         return ensure_scoped_permission(
             request,