Skip to content

Commit

Permalink
Merge branch 'main' into remove-axios
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgwalker
mgwalker authored Nov 21, 2024
2 parents 4c54911 + 1781211 commit 67f1e72
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
4 changes: 2 additions & 2 deletions InclusionBot.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ approves your changes, they will be merged and become active in the bot.
| Goddamn, goddam, goddamnit, goddammit | awful<br>terrible<br>wretched | This term can be offensive or triggering to some religious traditions because it implies a deity cursing or reproaching people. We want to show respect towards all religious traditions. |
| jesus fucking, fucking christ | Wow<br>oh no<br>oh my | We want to show respect towards all religious traditions. |
| mumbo jumbo | jargon<br>confusing language | The term ":TERM:" was used to stereotype African languages and cultures that didn't make sense to European colonizers.<br><br>See [some other commonly used terms that have racist origins](https://abcnews.go.com/Politics/commonly-terms-racist-origins/story?id=71840410). |

| kowtow, kotow, kow tow, kow-tow, cowtow, cow tow, cow-tow | submit<br>grovel | The modern usage of this word refers to groveling or submission, which is a disconnect from its real meaning as an act of deep respect. Modern usage of this term misses cultural nuance and perpetuates cultural misunderstanding.<br><br>See [the Slack thread](https://gsa-tts.slack.com/archives/C10EGE62W/p1727210606818389) where teammates discuss the term for more information.|

# Sexist
Expand All @@ -92,6 +91,7 @@ approves your changes, they will be merged and become active in the bot.
| Instead of | Consider | Why |
| ------------------------------------ | -------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
| postmortem, post mortem, post-mortem | project reflection<br>project or incident review<br>retrospective<br>retro | This term can trigger emotions related to death that employees may not want to process at work. |
| drop-dead date | last possible date | This term can trigger emotions related to death that employees may not want to process at work |
| drop-dead date | last possible date | This term can trigger emotions related to death that employees may not want to process at work. |
| suicide, suicidal, kill yourself | | This term can trigger emotions related to death that employees may not want to process at work. |
| fuck | | This term can trigger emotions related to abuse, trauma, and sexual assault that employees may not want to process at work. |
| shit | | This term can trigger emotions related to vulgarity that employees may not want to process at work. |
12 changes: 11 additions & 1 deletion src/scripts/inclusion-bot.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,17 @@ triggers:
- last possible date
why: >-
":TERM:" can trigger emotions related to death that employees may not want
to process at work
to process at work.
- matches:
- suicide
- suicidal
- kill yourself
alternatives:
- ''
why: >-
":TERM:" can trigger emotions related to death that employees may not want
to process at work.
- matches:
- fuck
Expand Down

0 comments on commit 67f1e72

Please sign in to comment.