Merge branch 'develop' into renovate/npm-semantic-release-vulnerability

Author: emilyrohrbough

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,10 @@
 - Closes <!-- link to the issue here, if there is one -->
 
 ### User facing changelog
-<!-- Explain the change(s) for every user to read in our changelog. Examples: https://on.cypress.io/changelog -->
+<!-- 
+Explain the change(s) for every user to read in our changelog. Examples: https://on.cypress.io/changelog
+If the change is not user-facing, write "n/a".
+-->
 
 ### Additional details
 <!-- Examples:
@@ -22,11 +25,14 @@
 Screenshots or GIFs are preferred. -->
 
 ### PR Tasks
-<!-- These tasks must be completed before a PR is merged.
-Delete tasks if they are not applicable. -->
+<!-- 
+These tasks must be completed before a PR is merged.
+If a task does not apply, write [na] instead of checking the box.
+DO NOT DELETE the PR checklist.
+-->
 
 - [ ] Have tests been added/updated?
-- [ ] Has the original issue or this PR been tagged with a release in ZenHub? <!-- (internal team only)-->
+- [ ] Has the original issue (or this PR, if no issue exists) been tagged with a release in ZenHub? (user-facing changes only)
 - [ ] Has a PR for user-facing changes been opened in [`cypress-documentation`](https://github.com/cypress-io/cypress-documentation)? <!-- Link to PR here -->
 - [ ] Have API changes been updated in the [`type definitions`](https://github.com/cypress-io/cypress/blob/develop/cli/types/cypress.d.ts)?
 - [ ] Have new configuration options been added to the [`cypress.schema.json`](https://github.com/cypress-io/cypress/blob/develop/cli/schema/cypress.schema.json)?

circle.yml

@@ -1884,17 +1884,6 @@ jobs:
           repo: cypress-example-todomvc
           browser: firefox
 
-  "test-binary-against-documentation-firefox":
-    <<: *defaults
-    resource_class: medium
-    steps:
-      - test-binary-against-repo:
-          repo: cypress-documentation
-          browser: firefox
-          command: "yarn cypress run"
-          wait-on: http://localhost:3000
-          server-start-command: yarn serve:dist
-
   "test-binary-against-conduit-chrome":
     <<: *defaults
     resource_class: medium
@@ -2233,16 +2222,16 @@ linux-workflow: &linux-workflow
 
     - test-binary-against-kitchensink-chrome:
         <<: *onlyMainBranches
-    - test-binary-against-conduit-chrome:
-        <<: *onlyMainBranches
+    # Re-enable when the cypress-example-conduit-app project is fixed.
+    # https://github.com/cypress-io/cypress-example-conduit-app/issues/346
+    # - test-binary-against-conduit-chrome:
+    #     <<: *onlyMainBranches
     - test-binary-against-recipes-firefox:
         <<: *onlyMainBranches
     - test-binary-against-kitchensink-firefox:
         <<: *onlyMainBranches
     - test-binary-against-todomvc-firefox:
         <<: *onlyMainBranches
-    - test-binary-against-documentation-firefox:
-        <<: *onlyMainBranches
     - test-binary-against-api-testing-firefox:
         <<: *onlyMainBranches
     - test-binary-against-piechopper-firefox: