Test smarter, not harder (#5166)

* Suppress rebases

Make Dependabot not rebase or try to touch packages for stuff not under
CI. Stop Github from auto-rebasing all PRs for us.

* Make merge checklist say you can check if a review has been addressed

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@ To be copied to the [draft changelog](https://github.com/DataBiosphere/toil/wiki
 
 ## Reviewer Checklist
 
-<!-- To be kept in sync with docs/contributing/checklist.rst -->
+<!-- To be kept in sync with docs/contributing/checklists.rst -->
 
  * [ ] Make sure it is coming from `issues/XXXX-fix-the-thing` in the Toil repo, or from an external repo.
     * [ ] If it is coming from an external repo, make sure to pull it in for CI with:
@@ -26,10 +26,10 @@ To be copied to the [draft changelog](https://github.com/DataBiosphere/toil/wiki
 
 ## Merger Checklist
 
-<!-- To be kept in sync with docs/contributing/checklist.rst -->
+<!-- To be kept in sync with docs/contributing/checklists.rst -->
 
-* [ ] Make sure the PR passes tests.
-* [ ] Make sure the PR has been reviewed **since its last modification**. If not, review it.
+* [ ] Make sure the PR passed tests, including the Gitlab tests, for the most recent commit in its branch.
+* [ ] Make sure the PR has been reviewed. If not, review it. If it has been reviewed and any requested changes seem to have been addressed, proceed.
 * [ ] Merge with the Github "Squash and merge" feature.
     * [ ] If there are multiple authors' commits, add [Co-authored-by](https://github.blog/2018-01-29-commit-together-with-co-authors/) to give credit to all contributing authors.
 * [ ] Copy its recommended changelog entry to the [Draft Changelog](https://github.com/DataBiosphere/toil/wiki/Draft-Changelog).

.github/dependabot.yml

@@ -4,7 +4,18 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    ignore:
+      # htcondor is not under CI
+      - dependency-name: "htcondor"
+      # Google cloud/storage is not under CI
+      - dependency-name: "apache-libcloud"
+      - dependency-name: "google-cloud-storage"
+      - dependency-name: "google-auth"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+# Don't constantly rebase all the dependency bump PRs whenever anything else
+# merges; this causes too many CI runs.
+rebase-strategy: ignore
+

docs/contributing/checklists.rst

@@ -43,8 +43,8 @@ This checklist is to be kept in sync with the checklist in the pull request temp
 
 When merging a PR, do the following:
 
-* |X| Make sure the PR passes tests.
-* |X| Make sure the PR has been reviewed **since its last modification**. If not, review it.
+* |X| Make sure the PR passed tests, including the Gitlab tests, for the most recent commit in its branch.
+* |X| Make sure the PR has been reviewed. If not, review it. If it has been reviewed and any requested changes seem to have been addressed, proceed.
 * |X| Merge with the Github "Squash and merge" feature.
     * |X| If there are multiple authors' commits, add `Co-authored-by`_ to give credit to all contributing authors.
         .. _Co-authored-by: https://github.blog/2018-01-29-commit-together-with-co-authors/