Skip to content

Commit 2ffca5f

Browse files
authored
Merge branch 'main' into ru-security-best-practices
2 parents 99002a4 + 3cfbdeb commit 2ffca5f

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.github/workflows/jekyll-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v4.2.2
33+
uses: actions/checkout@v5.0.0
3434
with:
3535
# For PRs make sure to checkout the PR branch
3636
ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/jekyll.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v4.2.2
30+
uses: actions/checkout@v5.0.0
3131
- name: Setup Pages
3232
uses: actions/[email protected]
3333
- name: Build with Jekyll

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Set up Git repository
14-
uses: actions/checkout@v4.2.2
14+
uses: actions/checkout@v5.0.0
1515
- name: Set up Ruby
16-
uses: ruby/setup-ruby@2a7b30092b0caf9c046252510f9273b4875f3db9 # v1
16+
uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1
1717
with:
1818
bundler-cache: true
1919
- name: Set up Node

_articles/how-to-contribute.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ A project also has documentation. These files are usually listed in the top leve
181181
Finally, open source projects use the following tools to organize discussion. Reading through the archives will give you a good picture of how the community thinks and works.
182182

183183
* **Issue tracker:** Where people discuss issues related to the project.
184-
* **Pull requests:** Where people discuss and review changes that are in progress, whether it's to improve a contributor's line of code, grammar usage, use of images, etc. Some projects, such as [MDN Web Docs](https://github.com/mdn/content/blob/main/.github/workflows/markdown-lint.yml), use certain GitHub Action flows to automate and quicken their code reviews.
184+
* **Pull/Merge requests:** Where people discuss and review changes that are in progress, whether it's to improve a contributor's line of code, grammar usage, use of images, etc. Some projects, such as [MDN Web Docs](https://github.com/mdn/content/blob/main/.github/workflows/markdown-lint.yml), use certain GitHub Action flows to automate and quicken their code reviews.
185185
* **Discussion forums or mailing lists:** Some projects may use these channels for conversational topics (for example, _"How do I..."_ or _"What do you think about..."_ instead of bug reports or feature requests). Others use the issue tracker for all conversations. A good example of this would be [CHAOSS' weekly Newsletter](https://chaoss.community/news/)
186186
* **Synchronous chat channel:** Some projects use chat channels (such as Slack or IRC) for casual conversation, collaboration, and quick exchanges. A good example of this would be [EddieHub's Discord community](http://discord.eddiehub.org/).
187187

@@ -224,6 +224,7 @@ You can also use one of the following resources to help you discover and contrib
224224
* [First Contributions](https://firstcontributions.github.io)
225225
* [SourceSort](https://web.archive.org/web/20201111233803/https://www.sourcesort.com/)
226226
* [OpenSauced](https://opensauced.pizza/)
227+
* [Gitlab Explore](https://gitlab.com/explore/projects/starred)
227228

228229
### A checklist before you contribute
229230

@@ -307,7 +308,7 @@ Now do the same for the project's pull requests.
307308
<div class="clearfix mb-2">
308309
<input type="checkbox" id="cbox10" class="d-block float-left mt-1 mr-2" value="checkbox">
309310
<label for="cbox10" class="overflow-hidden d-block text-normal">
310-
How many open pull requests are there?
311+
How many open pull/merge requests are there?
311312
</label>
312313
</div>
313314

0 commit comments

Comments
 (0)