Merge branch 'main' into main

Author: jmeridth

.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 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.
+- [ ] This change is not self-promotion.
 
 ### Which change are you proposing?
 

.github/workflows/collections-renames.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/[email protected]
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
         with:
           bundler-cache: true
 

.github/workflows/conflict.yml

@@ -14,12 +14,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 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 "> This change is not self-promotion.
+          echo "This is a requirement to maintain a high level of independence in this project. Please update to confirm there is no conflict of interest."
           echo "Thank you!"
           exit 1
-        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.')
+        if: contains(github.event.pull_request.body, '- [ ] This change is not self-promotion.')
         name: Fail
       - run: exit 0
-        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.')
+        if: contains(github.event.pull_request.body, '- [x] This change is not self-promotion.')
         name: Succeed

.github/workflows/jekyll_build.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: 💎 setup ruby
-        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
         with:
           bundler-cache: true
           cache-version: 0

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/[email protected]
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
         with:
           bundler-cache: true
 

.github/workflows/test.yml

@@ -43,7 +43,7 @@ jobs:
 
       - name: Setup Ruby
         if: ${{ steps.topics.outputs.changed || steps.collections.outputs.changed || steps.all.outputs.changed }}
-        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+        uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0
         with:
           bundler-cache: true
 

CONTRIBUTING.md

@@ -98,7 +98,7 @@ To propose a new topic or collection, please **open a pull request** with your p
 
 ## Guidelines
 
-- 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.
+- Avoid conflicts of interest. These should be of general community interest, not self promotion. If it is self promotion, 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.

Gemfile.lock

@@ -235,12 +235,12 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.11.3)
+    json (2.12.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.4)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     liquid (4.0.4)
     listen (3.9.0)
@@ -295,14 +295,14 @@ GEM
     public_suffix (5.1.1)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     regexp_parser (2.10.0)
     rexml (3.4.0)
     rouge (3.30.0)
-    rubocop (1.75.5)
+    rubocop (1.75.8)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

collections/learn-to-code/index.md

@@ -38,6 +38,7 @@ items:
  - Hexlet/hexletguides.github.io
  - aykutkardas/regexlearn.com
  - olexale/flutter_roadmap
+ - TheOdinProject/curriculum
 
 display_name: Learn to Code
 created_by: alysonla

collections/made-in-russia/index.md

@@ -4,6 +4,7 @@ items:
 - https://github.com/catboost/catboost
 - https://github.com/nginx
 - https://github.com/theKashey/awesome-made-by-russians
+- https://github.com/sergiomarotco/Network-segmentation-cheat-sheet
 
 display_name: Made in Russia
 created_by: toxblh