Skip to content

Commit 73062cb

Browse files
lwasserdependabot[bot]JimMadgeallcontributors[bot]JHWelch
authored
chore: add merge commit to handle merge conflicts when we merge into main (#929)
* chore(ci): add dependabot config for actions (#865) * chore(ci): bump actions/checkout from 3 to 5 (#883) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(ci): bump actions/setup-node from 3 to 4 (#882) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(ci): bump actions/upload-pages-artifact from 3 to 4 (#881) * chore(ci): bump actions/upload-pages-artifact from 3 to 4 Bumps [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-pages-artifact/releases) - [Commits](actions/upload-pages-artifact@v3...v4) --- updated-dependencies: - dependency-name: actions/upload-pages-artifact dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update .github/workflows/build-website.yml * chore(ci): update actions --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Leah Wasser <[email protected]> * chore(branch rename): rename master --> main throughout so ci runs and docs are correct (#890) chore(rename master to main branch): we renamed the master branch; this updates all actions & docs * docs: ✏️ fix links to doc site and small bug in footer.js (#871) * docs: ✏️ fix links to doc site and small bug in footer.js This change fixes an error in the footer and also updates some broken links. ✅ Closes: 870 * Update website/static/index.html Co-authored-by: Leah Wasser <[email protected]> * Update docs/overview.md --------- Co-authored-by: Jim Madge <[email protected]> * docs: add JimMadge as a contributor for review (#892) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Leah Wasser <[email protected]> * docs: add JHWelch as a contributor for doc (#894) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: add lwasser as a contributor for review (#897) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: add JimMadge as a contributor for infra (#896) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Jim Madge <[email protected]> * docs: ✏️ Add dark mode README logo (#741) Co-authored-by: Leah Wasser <[email protected]> Co-authored-by: Jim Madge <[email protected]> * docs: add RichLewis007 as a contributor for bug, and doc (#906) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: add parthamk as a contributor for doc (#909) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: add rebeccaringuette as a contributor for ideas (#910) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * Change build branch from 'master' to 'docs-upgrade' * docs: add description for Ideas, projectManagement and promotion (#829) * docs: add KhushiPandey8 as a contributor for doc (#918) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: add lwasser as a contributor for doc (#921) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: add JimMadge as a contributor for doc (#922) * docs: update README.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> * docs: linting fix * docs: remove last docusaurus files * docs: update * chore: fix linting step to handle mdx * chore: lint * fix: links --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jim Madge <[email protected]> Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> Co-authored-by: Jim Madge <[email protected]> Co-authored-by: Jordan Welch <[email protected]> Co-authored-by: Reshama Shaikh <[email protected]>
1 parent 80c66fa commit 73062cb

18 files changed

+100
-46
lines changed

‎.all-contributorsrc‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,9 @@
10401040
"avatar_url": "https://avatars.githubusercontent.com/u/7649194?v=4",
10411041
"profile": "http://www.leahwasser.com",
10421042
"contributions": [
1043-
"security"
1043+
"security",
1044+
"review",
1045+
"doc"
10441046
]
10451047
},
10461048
{
@@ -1049,7 +1051,8 @@
10491051
"avatar_url": "https://avatars.githubusercontent.com/u/153130183?v=4",
10501052
"profile": "https://mysiteintro.netlify.app/",
10511053
"contributions": [
1052-
"translation"
1054+
"translation",
1055+
"doc"
10531056
]
10541057
},
10551058
{
@@ -1067,7 +1070,9 @@
10671070
"avatar_url": "https://avatars.githubusercontent.com/u/23616154?v=4",
10681071
"profile": "https://blog.jmadge.com",
10691072
"contributions": [
1070-
"review"
1073+
"review",
1074+
"infra",
1075+
"doc"
10711076
]
10721077
},
10731078
{
@@ -1078,6 +1083,34 @@
10781083
"contributions": [
10791084
"doc"
10801085
]
1086+
},
1087+
{
1088+
"login": "RichLewis007",
1089+
"name": "Rich Lewis",
1090+
"avatar_url": "https://avatars.githubusercontent.com/u/1149213?v=4",
1091+
"profile": "https://github.com/RichLewis007",
1092+
"contributions": [
1093+
"bug",
1094+
"doc"
1095+
]
1096+
},
1097+
{
1098+
"login": "parthamk",
1099+
"name": "Partha Mallick",
1100+
"avatar_url": "https://avatars.githubusercontent.com/u/110169184?v=4",
1101+
"profile": "http://parthamallick.com",
1102+
"contributions": [
1103+
"doc"
1104+
]
1105+
},
1106+
{
1107+
"login": "rebeccaringuette",
1108+
"name": "Rebecca Ringuette",
1109+
"avatar_url": "https://avatars.githubusercontent.com/u/49281118?v=4",
1110+
"profile": "https://github.com/rebeccaringuette",
1111+
"contributions": [
1112+
"ideas"
1113+
]
10811114
}
10821115
],
10831116
"repoType": "github",

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,24 @@ workflows:
6262
filters:
6363
branches:
6464
only:
65-
- master
65+
- main
6666
- publish_release:
6767
requires:
6868
- node_modules
6969
filters:
7070
branches:
7171
only:
72-
- master
72+
- main
7373
- check_404s:
7474
requires:
7575
- publish_release
7676
filters:
7777
branches:
7878
only:
79-
- master
79+
- main
8080

8181
experimental:
8282
notify:
8383
branches:
8484
only:
85-
- master
85+
- main

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Please see the documentation for all configuration options:
2+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
3+
4+
version: 2
5+
updates:
6+
- package-ecosystem: "github-actions"
7+
directory: "/"
8+
schedule:
9+
interval: "monthly"
10+
commit-message:
11+
prefix: "chore(ci)"

‎.github/workflows/build-website.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: /actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1313
with:
1414
fetch-depth: 0
15-
- uses: actions/setup-node@v4
15+
- uses: actions/setup-node@dbe1369d7be17e7823f8c1ee1ae8bec5779239dd # v3.9.0
1616
with:
1717
node-version: 23
1818
cache: npm
@@ -25,7 +25,7 @@ jobs:
2525
ls dist/
2626
2727
- name: Upload Build Artifact
28-
uses: actions/upload-pages-artifact@v3
28+
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
2929
with:
3030
path: dist/
3131
deploy:
@@ -41,4 +41,4 @@ jobs:
4141
steps:
4242
- name: Deploy to GitHub Pages
4343
id: deployment
44-
uses: actions/deploy-pages@v4
44+
uses: actions/deploy-pages@f33f41b675f0ab2dc5a6863c9a170fe83af3571e # v4.0.0

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,16 @@ Thanks go to these wonderful people ([emoji key](https://allcontributors.org/doc
206206
<td align="center" valign="top" width="14.28%"><a href="https://github.com/VitorCodes"><img src="https://avatars.githubusercontent.com/u/15626985?v=4?s=100" width="100px;" alt="Vitor Silva"/><br /><sub><b>Vitor Silva</b></sub></a><br /><a href="#translation-VitorCodes" title="Translation">🌍</a></td>
207207
<td align="center" valign="top" width="14.28%"><a href="http://flpm.dev"><img src="https://avatars.githubusercontent.com/u/17676929?v=4?s=100" width="100px;" alt="Felipe Moreno"/><br /><sub><b>Felipe Moreno</b></sub></a><br /><a href="#translation-flpm" title="Translation">🌍</a> <a href="https://github.com/all-contributors/all-contributors/commits?author=flpm" title="Code">💻</a> <a href="https://github.com/all-contributors/all-contributors/commits?author=flpm" title="Documentation">📖</a></td>
208208
<td align="center" valign="top" width="14.28%"><a href="https://piyushpamnani.github.io/Piyush-Portfolio/"><img src="https://avatars.githubusercontent.com/u/87657297?v=4?s=100" width="100px;" alt="Piyush Pamnani"/><br /><sub><b>Piyush Pamnani</b></sub></a><br /><a href="https://github.com/all-contributors/all-contributors/commits?author=PiyushPamnani" title="Documentation">📖</a></td>
209-
<td align="center" valign="top" width="14.28%"><a href="http://www.leahwasser.com"><img src="https://avatars.githubusercontent.com/u/7649194?v=4?s=100" width="100px;" alt="Leah Wasser"/><br /><sub><b>Leah Wasser</b></sub></a><br /><a href="#security-lwasser" title="Security">🛡️</a></td>
210-
<td align="center" valign="top" width="14.28%"><a href="https://mysiteintro.netlify.app/"><img src="https://avatars.githubusercontent.com/u/153130183?v=4?s=100" width="100px;" alt="Khushi"/><br /><sub><b>Khushi</b></sub></a><br /><a href="#translation-KhushiPandey8" title="Translation">🌍</a></td>
209+
<td align="center" valign="top" width="14.28%"><a href="http://www.leahwasser.com"><img src="https://avatars.githubusercontent.com/u/7649194?v=4?s=100" width="100px;" alt="Leah Wasser"/><br /><sub><b>Leah Wasser</b></sub></a><br /><a href="#security-lwasser" title="Security">🛡️</a> <a href="https://github.com/all-contributors/all-contributors/pulls?q=is%3Apr+reviewed-by%3Alwasser" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/all-contributors/all-contributors/commits?author=lwasser" title="Documentation">📖</a></td>
210+
<td align="center" valign="top" width="14.28%"><a href="https://mysiteintro.netlify.app/"><img src="https://avatars.githubusercontent.com/u/153130183?v=4?s=100" width="100px;" alt="Khushi"/><br /><sub><b>Khushi</b></sub></a><br /><a href="#translation-KhushiPandey8" title="Translation">🌍</a> <a href="https://github.com/all-contributors/all-contributors/commits?author=KhushiPandey8" title="Documentation">📖</a></td>
211211
</tr>
212212
<tr>
213213
<td align="center" valign="top" width="14.28%"><a href="http://elmthomas.com"><img src="https://avatars.githubusercontent.com/u/58678?v=4?s=100" width="100px;" alt="Eric Thomas"/><br /><sub><b>Eric Thomas</b></sub></a><br /><a href="https://github.com/all-contributors/all-contributors/commits?author=et" title="Documentation">📖</a></td>
214-
<td align="center" valign="top" width="14.28%"><a href="https://blog.jmadge.com"><img src="https://avatars.githubusercontent.com/u/23616154?v=4?s=100" width="100px;" alt="Jim Madge"/><br /><sub><b>Jim Madge</b></sub></a><br /><a href="https://github.com/all-contributors/all-contributors/pulls?q=is%3Apr+reviewed-by%3AJimMadge" title="Reviewed Pull Requests">👀</a></td>
214+
<td align="center" valign="top" width="14.28%"><a href="https://blog.jmadge.com"><img src="https://avatars.githubusercontent.com/u/23616154?v=4?s=100" width="100px;" alt="Jim Madge"/><br /><sub><b>Jim Madge</b></sub></a><br /><a href="https://github.com/all-contributors/all-contributors/pulls?q=is%3Apr+reviewed-by%3AJimMadge" title="Reviewed Pull Requests">👀</a> <a href="#infra-JimMadge" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/all-contributors/all-contributors/commits?author=JimMadge" title="Documentation">📖</a></td>
215215
<td align="center" valign="top" width="14.28%"><a href="http://jordanwelch.com/"><img src="https://avatars.githubusercontent.com/u/4480375?v=4?s=100" width="100px;" alt="Jordan Welch"/><br /><sub><b>Jordan Welch</b></sub></a><br /><a href="https://github.com/all-contributors/all-contributors/commits?author=JHWelch" title="Documentation">📖</a></td>
216+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/RichLewis007"><img src="https://avatars.githubusercontent.com/u/1149213?v=4?s=100" width="100px;" alt="Rich Lewis"/><br /><sub><b>Rich Lewis</b></sub></a><br /><a href="https://github.com/all-contributors/all-contributors/issues?q=author%3ARichLewis007" title="Bug reports">🐛</a> <a href="https://github.com/all-contributors/all-contributors/commits?author=RichLewis007" title="Documentation">📖</a></td>
217+
<td align="center" valign="top" width="14.28%"><a href="http://parthamallick.com"><img src="https://avatars.githubusercontent.com/u/110169184?v=4?s=100" width="100px;" alt="Partha Mallick"/><br /><sub><b>Partha Mallick</b></sub></a><br /><a href="https://github.com/all-contributors/all-contributors/commits?author=parthamk" title="Documentation">📖</a></td>
218+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/rebeccaringuette"><img src="https://avatars.githubusercontent.com/u/49281118?v=4?s=100" width="100px;" alt="Rebecca Ringuette"/><br /><sub><b>Rebecca Ringuette</b></sub></a><br /><a href="#ideas-rebeccaringuette" title="Ideas, Planning, & Feedback">🤔</a></td>
216219
</tr>
217220
</tbody>
218221
</table>

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"astro": "astro",
1717
"link-check-md": "lychee src/content/docs/**/*.md --root-dir $(pwd)/public",
1818
"link-check-md-offline": "lychee src/content/docs/**/*.md --root-dir $(pwd)/public --offline",
19-
"lint": "markdownlint **/*.md --ignore node_modules"
19+
"lint": "markdownlint **/*.{md,mdx} --ignore node_modules",
20+
"lint-fix": "markdownlint **/*.{md,mdx} --ignore node_modules --fix"
2021
},
2122
"dependencies": {
2223
"@astrojs/sitemap": "^3.5.1",

‎src/content/docs/bot/configuration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ These are the keys you can specify:
2121
| `files` | Array of files to update. | Default: `['README.md']` |
2222
| `imageSize` | Size (in px) of the user's avatar. | Default: `100` |
2323
| `commit` | Auto-commit badge when adding contributors. | Default: `false` |
24-
| `commitConvention` | Commit convention ([`angular`](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-guidelines), [`atom`](https://github.com/atom/atom/blob/main/CONTRIBUTING.md#git-commit-messages), [`ember`](https://guides.emberjs.com/v1.10.0/contributing/#toc_commits), [`eslint`](https://eslint.org/docs/1.0.0/developer-guide/contributing#step-2-make-your-changes), [`jshint`](https://jshint.com/contribute/), [`gitmoji`](https://gitmoji.carloscuesta.me/), or `none`). | Default: `angular` |
24+
| `commitConvention` | Commit convention ([`angular`](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit), [`atom`](https://github.com/atom/atom/blob/main/CONTRIBUTING.md#git-commit-messages), [`ember`](https://guides.emberjs.com/v1.10.0/contributing/#toc_commits), [`eslint`](https://eslint.org/docs/latest/contribute/pull-requests#step2), [`jshint`](https://jshint.com/contribute/), [`gitmoji`](https://gitmoji.carloscuesta.me/), or `none`). | Default: `angular` |
2525
| `contributorsPerLine` | Maximum number of columns for the contributors table. | Default: `7` |
2626
| `contributorsSortAlphabetically` | `true`: Sort alphabetically. `false`: Display in order of addition. | Default: `false` |
2727
| `badgeTemplate` | Define your own lodash template to generate the badge. | |

‎src/content/docs/bot/installation.mdx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@ For the list:
4545

4646
<Aside type="caution"> The extra line is to allow the bot to properly add contributors to that block in your README file.</Aside>
4747

48-
For the badge use the following, replacing `projectOwner` with the relevant GitHub username or organization name, and `projectName` with the relevant the GitHub repo name.
48+
For the badge use the following, replacing `projectOwner` with the relevant GitHub username or organization name, and `projectName` with the relevant the GitHub repo name.
4949
Style, color, and other parameters can be customized to your liking — visit [shields.io](https://shields.io/) to make a custom badge.
5050

51-
5251
```markdown
5352
[![All Contributors](https://img.shields.io/github/all-contributors/projectOwner/projectName?color=ee8449&style=flat-square)](#contributors)
5453
```

‎src/content/docs/bot/overview.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import botUsage from '@assets/bot-usage.png';
1616

1717
Implementing the [All Contributors spec](/specification) by hand is a laborious process.
1818

19-
The `@all-contributors bot` makes adding contributors for contributions of all kinds easy!
19+
The `@all-contributors bot` makes adding contributors for contributions of all kinds easy!
2020

21-
1. First, you call the bot in any github issu or pull request and ask them to add a user for a specific contribution.
21+
1. First, you call the bot in any github issu or pull request and ask them to add a user for a specific contribution.
2222
2. Once you do this, the bot will automatically pull a user's profile image, grab the contribution type emoji, update the project README file with the new contributors and then open a Pull Request against the project.
2323

2424
<Picture src={botUsage} formats={['avif', 'webp']} alt="A screenshot of a github comment that says please add @user for design." />

‎src/content/docs/bot/usage.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ The bot will then create a Pull Request to add the contributor, then reply with
4141

4242
<Picture src={botUsage} alt="Example usage screenshot" />
4343

44-
### Natural Language Processing
44+
### Natural Language Processing
4545

4646
Your request to the bot doesn't need to be perfect. The bot will use [basic Natural Language Parsing](https://github.com/all-contributors/app/blob/main/lib/parse-comment.js) to determine your intent.
4747
> For example, this will work too:
4848
>
4949
> `Jane you are crushing it in the documentation and your infrastructure work has been great too. Let's add @jane.doe23 for her contributions. cc @all-contributors`
5050
>
5151
52-
The bot will work best in parsing your comment correctly if you precede the contributor's username with @ as shown above. Otherwise, the bot may not correctly identify the user.
52+
The bot will work best in parsing your comment correctly if you precede the contributor's username with @ as shown above. Otherwise, the bot may not correctly identify the user.

0 commit comments

Comments
 (0)