Merge branch 'master' into bugfix/fix-cocoa-link

Author: HazAT

.babelrc

@@ -11,6 +11,7 @@
     ]
   ],
   "plugins": [
+    "transform-class-properties",
     "transform-object-rest-spread",
     [
       "babel-plugin-transform-builtin-extend",
@@ -27,6 +28,19 @@
       "presets": [
         "react",
         "latest"
+      ],
+      "plugins": [
+        "transform-class-properties",
+        "transform-object-rest-spread",
+        [
+          "babel-plugin-transform-builtin-extend",
+          {
+            "globals": [
+              "Array"
+            ]
+          }
+        ],
+        "idx"
       ]
     }
   }

.eslintrc

@@ -14,6 +14,8 @@
     "require": false,
     "expect": false,
     "sinon": false,
+    "MockApiClient": true,
+    "TestStubs": true,
     "Raven": true,
     "jest": true
   },

.travis.yml

@@ -1,3 +1,4 @@
+filter_secrets: false
 sudo: false
 language: python
 rvm:

.vscode/settings.json

@@ -6,6 +6,10 @@
         "static": true,
         "node_modules": true,
         "htmlcov": true,
+        "build": true,
+        "*.log": true,
+        "*.egg-info": true,
+        "src/sentry/locale": true,
         "src/sentry/static/sentry/dist/": true
     },
     "files.trimTrailingWhitespace": true,

CHANGES

@@ -2,13 +2,20 @@ Version 8.18 (Unreleased)
 -------------------------
 
 - Expanded resolution options to allow current and explicit versions.
-- Removed support for global dsyms
 - Added proguard support
 - Removed support for global dsyms.
 - Moved Queue admin page to React.
 - Replaced usage of jQuery Flot library with internal graphs.
 - Expanded ignore actions to include deltas and rates for both occurances and
-  users imapcted.
+  users impacted.
+- Add a new option (`auth.allow-registration`) for determining whether registration
+  is allowed on an installation.
+- Moved "create organization" into React.
+- Expanded React Form components (Form, ApiForm).
+- Moved "create team" into React.
+- add Slack to supported auth backends in social auth (for plugins)
+- Expanded resolution actions (on stream) to include current release and explicit
+  release.
 
 Schema Changes
 ~~~~~~~~~~~~~~
@@ -29,9 +36,13 @@ Schema Changes
 - Drop index on ``ReleaseCommit(project_id)``
 - Drop unique constraint on ``ReleaseEnvironment(project_id, release_id, environment_id)``
 - Added GroupResolution.type
-- Added GropuResolution.actor_id
+- Added GroupResolution.actor_id
 - Added Project.platform
 - Added GroupSnooze.actor_id
+- Added ScheduledJob
+- Added GroupResolution.actor_id
+- Added ``ScheduledJob`` model
+- Added User.last_active
 
 API Changes
 ~~~~~~~~~~~

Dangerfile

@@ -103,7 +103,7 @@ warn("This change includes modification to a file that was backported from newer
 
 # Reasonable commits must update CHANGES
 if !github.pr_body.include?("#nochanges") && @S_CHANGE_LINES && git.lines_of_code > @S_CHANGE_LINES && !git.modified_files.include?("CHANGES") && checkFilesPattern(@S_CHANGES_REQUIRED_PATTERNS).any?
-    fail("You need to update CHANGES due to the size of this PR")
+    warn("You should update CHANGES due to the size of this PR")
 end
 
 if git.added_files.grep(@S_MIGRATIONS).any?

Makefile

@@ -1,13 +1,12 @@
+CPUS ?= $(shell sysctl -n hw.ncpu || echo 1)
+MAKEFLAGS += --jobs=$(CPUS)
 NPM_ROOT = ./node_modules
 STATIC_DIR = src/sentry/static/sentry
 
-install-python:
-	@echo "--> Installing Python dependencies"
-	pip install "setuptools>=0.9.8"
-	# order matters here, base package must install first
-	pip install -e .
-	pip install ujson
-	pip install "file://`pwd`#egg=sentry[dev]"
+develop: setup-git update-submodules install-python install-yarn
+	@echo ""
+
+develop-only: develop
 
 install-yarn:
 	@echo "--> Installing Node dependencies"
@@ -18,13 +17,21 @@ install-yarn:
 	# See: https://github.com/karma-runner/karma-phantomjs-launcher/issues/120#issuecomment-262634703
 	node ./node_modules/phantomjs-prebuilt/install.js
 
-install-python-tests:
-	pip install "file://`pwd`#egg=sentry[dev,tests,dsym]"
+install-python:
+	# must be executed serialially
+	$(MAKE) install-python-base
+	$(MAKE) install-python-tests
 
-develop-only: update-submodules install-python install-python-tests install-yarn
+install-python-base:
+	@echo "--> Installing Python dependencies"
+	pip install "setuptools>=0.9.8" "pip>=8.0.0"
+	# order matters here, base package must install first
+	pip install -e .
+	pip install ujson
+	pip install "file://`pwd`#egg=sentry[dev]"
 
-develop: develop-only setup-git
-	@echo ""
+install-python-tests:
+	pip install "file://`pwd`#egg=sentry[dev,tests,dsym]"
 
 dev-postgres: install-python
 
@@ -136,7 +143,7 @@ lint-js:
 	@echo ""
 
 coverage: develop
-	make test-python-coverage
+	$(MAKE) test-python-coverage
 	coverage html
 
 publish:
@@ -160,7 +167,9 @@ travis-upgrade-pip:
 travis-setup-cassandra:
 	echo "create keyspace sentry with replication = {'class' : 'SimpleStrategy', 'replication_factor': 1};" | cqlsh --cqlversion=3.1.7
 	echo 'create table nodestore (key text primary key, value blob, flags int);' | cqlsh -k sentry --cqlversion=3.1.7
-travis-install-python: travis-upgrade-pip install-python install-python-tests
+travis-install-python:
+	$(MAKE) travis-upgrade-pip
+	$(MAKE) install-python install-python
 	python -m pip install codecov
 travis-noop:
 	@echo "nothing to do here."
@@ -176,9 +185,13 @@ travis-install-mysql: travis-install-python
 	pip install mysqlclient
 	echo 'create database sentry;' | mysql -uroot
 travis-install-acceptance: install-yarn travis-install-postgres
-travis-install-js: travis-upgrade-pip install-python install-python-tests install-yarn
+travis-install-js:
+	$(MAKE) travis-upgrade-pip
+	$(MAKE) install-python install-yarn
 travis-install-cli: travis-install-postgres
-travis-install-dist: travis-upgrade-pip install-python install-python-tests install-yarn
+travis-install-dist:
+	$(MAKE) travis-upgrade-pip
+	$(MAKE) install-python install-yarn
 travis-install-django-18: travis-install-postgres
 	pip install "Django>=1.8,<1.9"
 

README.rst

@@ -23,7 +23,7 @@ Official Sentry SDKs
 * `Node <https://github.com/getsentry/raven-node>`_
 * `PHP <https://github.com/getsentry/sentry-php>`_
 * `Go <https://github.com/getsentry/raven-go>`_
-* `Java <https://github.com/getsentry/raven-java>`_
+* `Java <https://github.com/getsentry/sentry-java>`_
 * `Objective-C/Swift <https://github.com/getsentry/sentry-cocoa>`_
 * `C# <https://github.com/getsentry/raven-csharp>`_
 * `Perl <https://github.com/getsentry/perl-raven>`_

config/hooks/pre-commit

@@ -3,13 +3,10 @@ from __future__ import absolute_import
 
 import os
 import sys
-import subprocess
-import json
 
 from glob import glob
-from click import echo, style
 
-from sentry.lint.engine import check_files, get_js_files
+from sentry.lint.engine import check_files, js_format, yarn_check
 
 text_type = type(u'')
 
@@ -19,77 +16,6 @@ if 'VIRTUAL_ENV' in os.environ:
         '%s/lib/*/site-packages' % os.environ['VIRTUAL_ENV'])[0]
     sys.path.insert(0, site_packages)
 
-PRETTIER_VERSION = "1.2.2"
-
-def yarn_check(file_list):
-    """
-    Checks if package.json was modified WITHOUT a corresponding change in the Yarn
-    lockfile. This can happen if a user manually edited package.json without running Yarn.
-
-    This is a user prompt right now because there ARE cases where you can touch package.json
-    without a Yarn lockfile change, e.g. Jest config changes, license changes, etc.
-    """
-    if file_list is None or os.environ.get('SKIP_YARN_CHECK'):
-        return False
-
-    if 'package.json' in file_list and 'yarn.lock' not in file_list:
-        echo(style("""
-Warning: package.json modified without accompanying yarn.lock modifications.
-
-If you updated a dependency/devDependency in package.json, you must run `yarn install` to update the lockfile.
-
-To skip this check, run:
-
-$ SKIP_YARN_CHECK=1 git commit [options]""", fg='yellow'))
-        return True
-
-    return False
-
-
-def js_format(file_list=None):
-    """
-    We only format JavaScript code as part of this pre-commit hook. It is not part
-    of the lint engine.
-    """
-    project_root = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir)
-    prettier_path = os.path.join(project_root, 'node_modules', '.bin', 'prettier')
-
-    if not os.path.exists(prettier_path):
-        echo('!! Skipping JavaScript formatting because prettier is not installed.', err=True)
-        return False
-
-    # Get Prettier version from package.json
-    package_version = None
-    package_json_path = os.path.join(project_root, 'package.json')
-    with open(package_json_path) as package_json:
-        try:
-            package_version = json.load(package_json)['devDependencies']['prettier']
-        except KeyError:
-            echo('!! Prettier missing from package.json', err=True)
-            return False
-
-    prettier_version = subprocess.check_output([prettier_path, '--version']).rstrip()
-    if prettier_version != package_version:
-        echo('!! Prettier is out of date: %s (expected %s). Please run `yarn install`.' \
-            % (prettier_version, package_version), err=True)
-        return False
-
-    js_file_list = get_js_files(file_list)
-
-    has_errors = False
-    if js_file_list:
-        status = subprocess.Popen([prettier_path, '--write', '--single-quote',
-            '--bracket-spacing=false', '--print-width=90', '--jsx-bracket-same-line=true'] +
-            js_file_list
-        ).wait()
-        has_errors = status != 0
-
-        if not has_errors:
-            # Stage modifications by Prettier
-            status = subprocess.Popen(['git', 'update-index', '--add'] + file_list).wait()
-            has_errors = status != 0
-
-    return has_errors
 
 def main():
     from flake8.hooks import run

package.json

@@ -12,6 +12,7 @@
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-idx": "^1.5.1",
     "babel-plugin-transform-builtin-extend": "^1.1.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.20.2",
     "babel-polyfill": "6.20.0",
     "babel-preset-latest": "^6.16.0",
@@ -41,7 +42,7 @@
     "platformicons": "0.1.1",
     "po-catalog-loader": "^1.2.0",
     "query-string": "2.4.2",
-    "raven-js": "3.15.0",
+    "raven-js": "3.16.1",
     "react": "15.3.2",
     "react-addons-css-transition-group": "15.3.2",
     "react-addons-pure-render-mixin": "15.3.2",
@@ -103,5 +104,8 @@
     "sinon": "1.17.2",
     "sinon-chai": "2.8.0",
     "webpack-livereload-plugin": "^0.11.0"
+  },
+  "optionalDependencies": {
+    "fsevents": "^1.1.2"
   }
 }