04131988 · Fix91 · Feb 7, 2024 · Feb 7, 2024 · Feb 7, 2024 · Feb 7, 2024
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@
 ### Please confirm this pull request meets the following requirements:
 
 - [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/main/CONTRIBUTING.md>.
-- [ ] I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).
+- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.
 
 ### Which change are you proposing?
 
@@ -21,7 +21,7 @@ I'm suggesting these edits to an existing topic or collection:
 
 > Please replace this line with an explanation of why you think these changes should be made.
 
-<!-- ⚠️ ... or this section ⚠️ -->
+<!-- ⚠️ this section... ⚠️ -->
 ### Curating a new topic or collection
 
 - [ ] I've formatted my changes as a new folder directory, named for the topic or collection as it appears in the URL on GitHub (e.g. `https://github.com/topics/[NAME]` or `https://github.com/collections/[NAME]`)

diff --git a/.github/workflows/collections-renames.yml b/.github/workflows/collections-renames.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'github'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -20,7 +20,7 @@ jobs:
       - name: Test collection with autofix and commit changes
         uses: technote-space/create-pr-action@v2
         env:
-          GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AUTOCORRECT_RENAMED_REPOS: 1
         with:
           EXECUTE_COMMANDS: |

diff --git a/.github/workflows/conflict.yml b/.github/workflows/conflict.yml
@@ -2,6 +2,7 @@ name: Check for conflicts of interest
 
 on:
   pull_request:
+  merge_group:
 
 jobs:
   check:
@@ -10,12 +11,12 @@ jobs:
       - run: |
           echo "In order to review this pull request for acceptance, we need to make sure that all of the prerequisites are satisfied."
           echo "This was not checked:"
-          echo "> I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee)"
+          echo "> I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding."
           echo "This is a requirement to maintain a high level of independence in this project. Please update if you are able to verify that you meet that requirement."
           echo "Thank you!"
           exit 1
-        if: contains(github.event.pull_request.body, '- [ ] I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).')
+        if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
         name: Fail
       - run: exit 0
-        if: contains(github.event.pull_request.body, '- [x] I have no affiliation with the project I am suggesting (as a maintainer, creator, contractor, or employee).')
+        if: contains(github.event.pull_request.body, '- [x] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
         name: Succeed
diff --git a/.github/workflows/jekyll_build.yml b/.github/workflows/jekyll_build.yml
@@ -1,30 +1,52 @@
 name: Build and Publish Jekyll for GitHub Pages
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
 
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
 jobs:
-  jekyll:
+  build:
     runs-on: ubuntu-latest
     steps:
-    - name: 📂 setup
-      uses: actions/checkout@v3
+    - name: 📂 checkout
+      uses: actions/checkout@v4
 
     - name: 💎 setup ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
       with:
-        ruby-version: 3.1.2
+        bundler-cache: true
+        cache-version: 0
+
+    - name: 📄 setup pages
+      id: pages
+      uses: actions/configure-pages@v5
 
     - name: 🔨 install dependencies & build site
-      uses: limjh16/jekyll-action-ts@v2
-      with:
-        enable_cache: true
-
-    - name: 🚀 deploy
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./_site
-        publish_branch: gh-pages
+      uses: actions/jekyll-build-pages@v1.0.12
+
+    - name: ⚡️ upload artifact
+      uses: actions/upload-pages-artifact@v3
+
+  deploy:
+    needs: build
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🚀 deploy
+        id: deployment
+        uses: actions/deploy-pages@v4.0.5
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,21 +6,27 @@ on:
       - main
   pull_request:
   workflow_dispatch:
+  merge_group:
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
 
       - name: Run linters
+        if: ${{ github.event_name != 'merge_group' }}
         uses: wearerequired/lint-action@v2
         with:
           auto_fix: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login == github.repository_owner }}
           rubocop: true
           rubocop_command_prefix: bundle exec
+
+      - name: Skip with successful status
+        if: ${{ github.event_name == 'merge_group' }}
+        run: exit 0
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -14,7 +14,7 @@ jobs:
       pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v7
+    - uses: actions/stale@v9
       with:
         stale-pr-message: >
           This pull request has been automatically marked as stale because it has not

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,6 +6,7 @@ on:
       - main
   pull_request:
   workflow_dispatch:
+  merge_group:
 
 jobs:
   test:
@@ -18,7 +19,7 @@ jobs:
           - all
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+Gemfile.lock
 scripts/
 _site
 .sass-cache

diff --git a/CODEOWNERS b/CODEOWNERS
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-Hi there! We're excited you've got ideas to improve topics and collections. You're helping the community discover valuable information.
+Hi there! We're excited you have ideas to improve topics and collections. You're helping the community discover valuable information.
 
 This project adheres to the [Contributor Covenant Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code.
 
@@ -11,7 +11,7 @@ There are a few ways you can contribute:
 
 As you write content, check out the [Style Guide](./docs/styleguide.md) to learn what each field means, and how it should be formatted. Following the style guide will increase the chances of your contribution being accepted.
 
-Notes: 
+Notes:
   - Updates won't immediately appear once we've merged your PR. We pull in these changes regularly to GitHub.
   - Please limit your pull request to the creation/updating of one topic or collection at a time.
 
@@ -24,7 +24,7 @@ If a topic or collection already exists, it will be listed in its respective dir
 
 The topic or collection name should match its URL, e.g. `https://github.com/topics/rails` corresponds to the [`topics/rails` directory](https://github.com/github/explore/tree/main/topics/rails).
 
-To make an improvement, please **open a pull request** with your proposed changes:
+To make an improvement, please **open a pull request** with your proposed changes. 
 
 ### Update the image
 
@@ -80,7 +80,7 @@ Drop the code bass with these musically themed repositories.
 
 The [pull request template](./.github/PULL_REQUEST_TEMPLATE.md) also provides guidance on the information you need to include.
 
-**Please fill out the pull request template completely.** If you do not fill out the template, your PR will be closed.
+**Please fill out the pull request template completely,** if you do not fill out the template, your PR will be closed.
 
 ## Curating a new topic or collection
 
@@ -98,7 +98,11 @@ This repository includes [a list of the most-used GitHub topics that don't yet h
 
 ## Guidelines
 
-* Avoid conflicts of interest. Maintainers of a project cannot add a topic or collection for their own project. If a topic is popular enough to warrant inclusion, someone else will add or improve it.
+* Avoid conflicts of interest. These should be of general community interest, not a marketing vehicle for a product or a personal project. If you are a direct employee of a company creating the project, or the creator and sole maintainer, it's unlikely to be accepted.
+* We love experimenting with new technologies, and we are especially fond of GitHub Copilot. But as with all new technology, many of us are still getting accustomed to using generative AI tools effectively. Here are important guidelines to follow when using generative AI to contribute to this repository (adapted from the [GitHub Community Discussions CoC](https://github.com/community/community/blob/main/CODE_OF_CONDUCT.md#reasonable-use-of-ai-generated-content)):
+  * Read and revise the content before you post it. Use your own authentic voice and edit.
+  * Do not post AI-generated content verbatim to pad out the size and number of your contributions. Your changes should materially improve the site, not just say the same thing in different words.
+  * AI tools will often provide completely inaccurate or invented answers to prompts. Verify with an independent source that the information is correct before including it.
 
 ## Running tests