Merge branch 'master' into window-blur

.github/CONTRIBUTING.md

@@ -4,8 +4,8 @@ Brave welcomes contributions via [pull requests](https://github.com/brave/browse
 
 ## Before you make changes
 
-* Submit a [ticket](https://github.com/brave/browser-laptop/issues) for your issue if one does not already exist. Please include the Brave version, operating system, and steps to reproduce the issue. Note that this is not necessary for trivial changes (spelling fixes, minor documentation changes, etc).
-* For changes to javascript files, we recommend installing a [Standard](http://standardjs.com/) plugin for your preferred text editor in order to ensure code style consistency.
+* Submit a [ticket](https://github.com/brave/browser-laptop/issues) for your issue if one does not already exist. Please include the Brave version, operating system, and steps to reproduce the issue.
+* For changes to JavaScript files, we recommend installing a [Standard](http://standardjs.com/) plugin for your preferred text editor in order to ensure code style consistency.
 
 ## Making changes
 
@@ -27,4 +27,26 @@ Brave welcomes contributions via [pull requests](https://github.com/brave/browse
 
 ## Pull requests
 
-Feel free to tag a Brave employee in the pull request to assign them to review your code. For design-related changes, it is helpful to include screenshots.
+### Each pull request should include
+
+* a descriptive title; this gets used in the [release notes](https://github.com/brave/browser-laptop/releases/tag/0.11.6dev)
+* a short summary of the changes
+* a reference to the issue that it fixes
+* steps to test the fix (if applicable)
+* for design-related changes, it is helpful to include screenshots
+
+Feel free to tag a Brave employee in the pull request to assign them to review your code.
+
+### Employees should
+
+* Assign the issue being fixed to a milestone.
+* Ensure another employee is tagged in the PR to review the code, via the `Auditor: @username` syntax.
+* Flag issues with `qa-steps-specified` if there are special things to test at the issue level. In particular you should always specify this if there’s an upgrade of the session store file.  It’s a signal to QA to make sure they pay extra special attention to this task.
+
+### Considerations before submitting a pull request
+
+* If you made a design or layout change, was there a mock-up provided? Do your changes match it?
+* Does your pull request fix multiple issues? If so, you may consider breaking into separate PRs.
+* Did you include tests? (we currently have both unit tests and web driver tests)
+* Did you manually test your new change?
+* If your change affects session, did you include steps to test? You may also consider manually testing an upgrade.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,6 @@
 - [ ] Submitted a [ticket](https://github.com/brave/browser-laptop/issues) for my issue if one did not already exist.
 - [ ] Used Github [auto-closing keywords](https://help.github.com/articles/closing-issues-via-commit-messages/) in the commit message.
-- [ ] Ran `git rebase -i` to squash commits if needed.
+- [ ] Added/updated tests for this change (for new code or code which already has tests).
+- [ ] Ran `git rebase -i` to squash commits (if needed).
+
+Test Plan:

.vscode/launch.json

@@ -4,27 +4,29 @@
 	"configurations": [
 		{
 			// Name of configuration; appears in the launch configuration drop down menu.
-			"name": "Launch ./app/index.js",
+			"name": "Launch",
 			// Type of configuration.
 			"type": "node",
 			// Workspace relative or absolute path to the program.
-			"program": "./app/index.js",
+			"program": "${workspaceRoot}/app/index.js",
 			// Automatically stop program after launch.
 			"stopOnEntry": false,
 			// Command line arguments passed to the program.
-			"args": ["--debug=5858", "app"],
+			"args": [".", "-enable-logging", "--v=0", "--enable-dcheck"],
 			// Workspace relative or absolute path to the working directory of the program being debugged. Default is the current workspace.
-			"cwd": ".",
+			"cwd": "${workspaceRoot}",
 			// Workspace relative or absolute path to the runtime executable to be used. Default is the runtime executable on the PATH.
-			"runtimeExecutable": "./node_modules/electron-prebuilt/dist/Brave.app/Contents/MacOS/Brave",
+			"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
 			// Optional arguments passed to the runtime executable.
-			"runtimeArgs": ["--nolazy"],
+			"runtimeArgs": [],
 			// Environment variables passed to the program.
 			"env": {
-				"NODE_ENV": "development"
+				"NODE_ENV": "development",
+				"npm_package_config_port": 8080
 			},
 			// Use JavaScript source maps (if they exist).
-			"sourceMaps": false,
+			"sourceMaps": true,
+			"port": 5858,
 			// If JavaScript source maps are enabled, the generated code is expected in this directory.
 			"outDir": null
 		},