Skip to content

Commit 4eb6d35

Browse files
authored
Merge branch 'main' into add-arabic-translation
2 parents 6993581 + fb5dc20 commit 4eb6d35

File tree

7 files changed

+18
-17
lines changed

7 files changed

+18
-17
lines changed

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
stale:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/stale@v10.0.0
14+
- uses: actions/stale@v10.1.0
1515
with:
1616
stale-pr-message: >
1717
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
- name: Set up Git repository
1414
uses: actions/[email protected]
1515
- name: Set up Ruby
16-
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1
16+
uses: ruby/setup-ruby@ab177d40ee5483edb974554986f56b33477e21d0 # v1
1717
with:
1818
bundler-cache: true
1919
- name: Set up Node
20-
uses: actions/setup-node@v5.0.0
20+
uses: actions/setup-node@v6.0.0
2121
- name: Bootstrap
2222
run: script/bootstrap
2323
env:

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ GEM
308308
rb-fsevent (0.11.2)
309309
rb-inotify (0.11.1)
310310
ffi (~> 1.0)
311-
rexml (3.3.9)
311+
rexml (3.4.2)
312312
rouge (3.30.0)
313313
ruby-rc4 (0.1.5)
314314
rubyzip (2.3.2)

_articles/building-community.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ A welcoming community is an investment into your project's future and reputation
2020

2121
One way to think about your project's community is through what @MikeMcQuaid calls the [contributor funnel](https://mikemcquaid.com/2018/08/14/the-open-source-contributor-funnel-why-people-dont-contribute-to-your-open-source-project/):
2222

23-
![Contributor funnel](/assets/images/building-community/contributor_funnel_mikemcquaid.png)
23+
![Contributor funnel starts with users, then contributors, then maintainers.](/assets/images/building-community/contributor_funnel_mikemcquaid.png)
2424

2525
As you build your community, consider how someone at the top of the funnel (a potential user) might theoretically make their way to the bottom (an active maintainer). Your goal is to reduce friction at each stage of the contributor experience. When people have easy wins, they will feel incentivized to do more.
2626

@@ -38,7 +38,7 @@ Start with your documentation:
3838
* **If there's a contribution you disagree with,** thank them for their idea and [explain why](../best-practices/#learning-to-say-no) it doesn't fit into the scope of the project, linking to relevant documentation if you have it.
3939

4040
<aside markdown="1" class="pquote">
41-
<img src="https://avatars.githubusercontent.com/mikeal?s=180" class="pquote-avatar" alt="avatar">
41+
<img src="https://avatars.githubusercontent.com/mikeal?s=180" class="pquote-avatar" alt="">
4242
Contributing to open source is easier for some than others. There's a lot of fear of being yelled at for not doing something right or just not fitting in. (...) By giving contributors a place to contribute with very low technical proficiency (documentation, web content markdown, etc) you can greatly reduce those concerns.
4343
<p markdown="1" class="pquote-credit">
4444
@mikeal, ["Growing a contributor base in modern open source"](https://opensource.com/life/16/5/growing-contributor-base-modern-open-source)
@@ -52,7 +52,7 @@ Encouraging other contributors is an investment in yourself, too. When you empow
5252
### Document everything
5353

5454
<aside markdown="1" class="pquote">
55-
<img src="https://avatars.githubusercontent.com/janl?s=180" class="pquote-avatar" alt="avatar">
55+
<img src="https://avatars.githubusercontent.com/janl?s=180" class="pquote-avatar" alt="">
5656
Have you ever been to a (tech-) event where you didn't know anyone, but everyone else seemed to stand in groups and chat like old friends? (...) Now imagine you want to contribute to an open source project, but you don't see why or how this is happening.
5757
<p markdown="1" class="pquote-credit">
5858
@janl, ["Sustainable Open Source"](https://web.archive.org/web/20200723213552/https://writing.jan.io/2015/11/20/sustainable-open-source.html)
@@ -81,7 +81,7 @@ Try to be responsive when someone files an issue, submits a pull request, or ask
8181

8282
Even if you can't review the request immediately, acknowledging it early helps increase engagement. Here's how @tdreyno responded to a pull request on [Middleman](https://github.com/middleman/middleman/pull/1466):
8383

84-
![Middleman pull request](/assets/images/building-community/middleman_pr.png)
84+
![@tdreyno commented "Thanks for diving in @joallard. I'm traveling right now, but will try to review and comment soon." A day later they said "You're absolutely right, this extension is really crufty. I've merged in a lot of features, not knowing which are good or bad because I only use i18n in the simplest way, myself. We'd love any direction, code and ideas you have. I really like this iterative approach, slowly adding features rather than a complete do-over. I'm going to push out v4 beta 1 today, so let's save this for beta 2. And we need to track down that failing test." @joallard commented "Awesome. I'll go forward then!"](/assets/images/building-community/middleman_pr.png)
8585

8686
[A Mozilla study found that](https://docs.google.com/presentation/d/1hsJLv1ieSqtXBzd5YZusY-mB8e1VJzaeOmh8Q4VeMio/edit#slide=id.g43d857af8_0177) contributors who received code reviews within 48 hours had a much higher rate of return and repeat contribution.
8787

@@ -114,7 +114,7 @@ Any popular project will inevitably attract people who harm, rather than help, y
114114
Do your best to adopt a zero-tolerance policy towards these types of people. If left unchecked, negative people will make other people in your community uncomfortable. They may even leave.
115115

116116
<aside markdown="1" class="pquote">
117-
<img src="https://avatars.githubusercontent.com/okdistribute?s=180" class="pquote-avatar" alt="avatar">
117+
<img src="https://avatars.githubusercontent.com/okdistribute?s=180" class="pquote-avatar" alt="">
118118
The truth is that having a supportive community is key. I'd never be able to do this work without the help of my colleagues, friendly internet strangers, and chatty IRC channels. (...) Don't settle for less. Don't settle for assholes.
119119
<p markdown="1" class="pquote-credit">
120120
@okdistribute, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
@@ -146,7 +146,7 @@ For example, here's how [Rubinius](https://github.com/rubinius/rubinius/) starts
146146
### Share ownership of your project
147147

148148
<aside markdown="1" class="pquote">
149-
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="avatar">
149+
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="">
150150
Your leaders will have different opinions, as all healthy communities should! However, you need to take steps to ensure the loudest voice doesn't always win by tiring people out, and that less prominent and minority voices are heard.
151151
<p markdown="1" class="pquote-credit">
152152
@sagesharp, ["What makes a good community?"](https://sage.thesharps.us/2015/10/06/what-makes-a-good-community/)
@@ -159,7 +159,7 @@ See if you can find ways to share ownership with your community as much as possi
159159

160160
* **Resist fixing easy (non-critical) bugs.** Instead, use them as opportunities to recruit new contributors, or mentor someone who'd like to contribute. It may seem unnatural at first, but your investment will pay off over time. For example, @michaeljoseph asked a contributor to submit a pull request on a [Cookiecutter](https://github.com/audreyr/cookiecutter) issue below, rather than fix it himself.
161161

162-
![Cookiecutter issue](/assets/images/building-community/cookiecutter_submit_pr.png)
162+
![@michaeljoseph saying "Thanks for the issue. Do you think you could submit a quick PR for this?"](/assets/images/building-community/cookiecutter_submit_pr.png)
163163

164164
* **Start a CONTRIBUTORS or AUTHORS file in your project** that lists everyone who's contributed to your project, like [Sinatra](https://github.com/sinatra/sinatra/blob/HEAD/AUTHORS.md) does.
165165

@@ -174,7 +174,7 @@ The reality is that [most projects only have](https://peerj.com/preprints/1233/)
174174
While you may not always find someone to answer the call, putting a signal out there increases the chances that other people will pitch in. And the earlier you start, the sooner people can help.
175175

176176
<aside markdown="1" class="pquote">
177-
<img src="https://avatars.githubusercontent.com/gr2m?s=180" class="pquote-avatar" alt="avatar">
177+
<img src="https://avatars.githubusercontent.com/gr2m?s=180" class="pquote-avatar" alt="">
178178
\[It's in your\] best interest to recruit contributors who enjoy and who are capable of doing the things that you are not. Do you enjoy coding, but not answering issues? Then identify those individuals in your community who do and let them have it.
179179
<p markdown="1" class="pquote-credit">
180180
@gr2m, ["Welcoming Communities"](http://hood.ie/blog/welcoming-communities.html)
@@ -196,7 +196,7 @@ When your community is grappling with a difficult issue, tempers may rise. Peopl
196196
Your job as a maintainer is to keep these situations from escalating. Even if you have a strong opinion on the topic, try to take the position of a moderator or facilitator, rather than jumping into the fight and pushing your views. If someone is being unkind or monopolizing the conversation, [act immediately](../building-community/#dont-tolerate-bad-actors) to keep discussions civil and productive.
197197

198198
<aside markdown="1" class="pquote">
199-
<img src="https://avatars.githubusercontent.com/kennethreitz?s=180" class="pquote-avatar" alt="avatar">
199+
<img src="https://avatars.githubusercontent.com/kennethreitz?s=180" class="pquote-avatar" alt="">
200200
As a project maintainer, it's extremely important to be respectful to your contributors. They often take what you say very personally.
201201
<p markdown="1" class="pquote-credit">
202202
@kennethreitz, ["Be Cordial or Be on Your Way"](https://web.archive.org/web/20200509154531/https://kenreitz.org/essays/be-cordial-or-be-on-your-way)
@@ -222,7 +222,7 @@ Sometimes, voting is a necessary tiebreaker. As much as you are able, however, e
222222
Under a consensus seeking process, community members discuss major concerns until they feel they have been adequately heard. When only minor concerns remain, the community moves forward. "Consensus seeking" acknowledges that a community may not be able to reach a perfect answer. Instead, it prioritizes listening and discussion.
223223

224224
<aside markdown="1" class="pquote">
225-
<img src="https://avatars.githubusercontent.com/lee-dohm?s=180" class="pquote-avatar" alt="avatar">
225+
<img src="https://avatars.githubusercontent.com/lee-dohm?s=180" class="pquote-avatar" alt="">
226226
Part of the reason why a voting system doesn't exist for Atom Issues is because the Atom team isn't going to follow a voting system in all cases. Sometimes we have to choose what we feel is right even if it is unpopular. (...) What I can offer and pledge to do...is that it is my job to listen to the community.
227227
<p markdown="1" class="pquote-credit">
228228
@lee-dohm on Atom's decision making process
@@ -248,7 +248,7 @@ If the conversation is starting to unravel, ask the group, _"Which steps should
248248
If a conversation clearly isn't going anywhere, there are no clear actions to be taken, or the appropriate action has already been taken, close the issue and explain why you closed it.
249249

250250
<aside markdown="1" class="pquote">
251-
<img src="https://avatars.githubusercontent.com/kfogel?s=180" class="pquote-avatar" alt="avatar">
251+
<img src="https://avatars.githubusercontent.com/kfogel?s=180" class="pquote-avatar" alt="">
252252
Guiding a thread toward usefulness without being pushy is an art. It won't work to simply admonish people to stop wasting their time, or to ask them not to post unless they have something constructive to say. (...) Instead, you have to suggest conditions for further progress: give people a route, a path to follow that leads to the results you want, yet without sounding like you're dictating conduct.
253253
<p markdown="1" class="pquote-credit">
254254
@kfogel, [_Producing OSS_](https://producingoss.com/en/producingoss.html#common-pitfalls)

_articles/pt/leadership-and-governance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ There are three common governance structures associated with open source project
100100

101101
* **Meritocracy:** **(Note: o termo "meritocracy" carrega uma conotação negativa em algumas comunidades e possui [uma história política e social complexa](http://geekfeminism.wikia.com/wiki/Meritocracy).)** Sob a meritocracy, contribuidores ativos do projeto (aqueles que demonstram "mérito") recebem um papel formal de tomada de decisão. As decisões, geralmente, são tomadas baseadas em puro consenso de voto. O conceito de meritocracy foi cunhado pela [Apache Foundation](https://www.apache.org/); [todos os projetos Apache](https://www.apache.org/index.html#projects-list) são meritocracias. Contribuições só podem ser feitas por indivíduos representando eles mesmos, não por uma companhia.
102102

103-
* **Liberal contribution:** Sob um modelo liberal contribution, as pessoas que trabalham mais são reconhecidas como mais influentes, mas isso é baseado no trabalho atual e não no histórico de contribuições. As principais decisões do projeto são tomadas com base em um processo de busca por consenso (discuta as principais queixas) em vez de voto puro, e se esforçam para incluir o máximo de perspectivas da comunidade possível. Exemplos populares de projetos que usam o modelo liberal contribution incluem o [Node.js](https://foundation.nodejs.org/) e o [Rust](https://www.rust-lang.org/en-US/).
103+
* **Liberal contribution:** Sob um modelo liberal contribution, as pessoas que trabalham mais são reconhecidas como mais influentes, mas isso é baseado no trabalho atual e não no histórico de contribuições. As principais decisões do projeto são tomadas com base em um processo de busca por consenso (discuta as principais queixas) em vez de voto puro, e se esforçam para incluir o máximo de perspectivas da comunidade possível. Exemplos populares de projetos que usam o modelo liberal contribution incluem o [Node.js](https://foundation.nodejs.org/) e o [Rust](https://rust-lang.org/).
104104

105105
Qual delas você deve usar? A decisão é sua! Todos os modelos possuem vantagens e desvantagens. E possam parecer bastante diferentes à primeira vista, todos os três modelos tem mais em comum do que parecem. Se você está interessado em adotar algum desses modelos, veja esses templates:
106106

_articles/zh-hant/leadership-and-governance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ redirect_from: /zh-tw/leadership-and-governance/
102102

103103
* **精英制:** **(注: 術語 "精英制" 對於一些社群可能具有消極的含義,其擁有較[複雜的社會和政治的歷史](http://geekfeminism.wikia.com/wiki/Meritocracy).)** 在精英制下,活躍的專案貢獻者(他們用行動證明自己是"精英")給一個正式的決策作用,決定通常會基於純粹的投票一致性。精英制的概念首次由[Apache Foundation](http://www.apache.org/)提出;[所有的Apache 專案](http://www.apache.org/index.html#projects-list) 都是基於精英制的。貢獻者只能代表自己是獨立的個體,不可以是公司。
104104

105-
* **自由貢獻:** 在自由貢獻的模式下,做最多工作的人通常被認爲是最具影響力的,但是是基於當前的工作,而不是歷史的共享。專案的重大決策是基於尋求共識的過程(對不同的聲音要討論)而不是純粹的投票,儘可能的努力的去囊括多的社群觀點。較流行的使用自由貢獻模式的專案有[Node.js](https://nodejs.org/en/foundation/)[Rust](https://www.rust-lang.org/en-US/)
105+
* **自由貢獻:** 在自由貢獻的模式下,做最多工作的人通常被認爲是最具影響力的,但是是基於當前的工作,而不是歷史的共享。專案的重大決策是基於尋求共識的過程(對不同的聲音要討論)而不是純粹的投票,儘可能的努力的去囊括多的社群觀點。較流行的使用自由貢獻模式的專案有[Node.js](https://nodejs.org/en/foundation/)[Rust](https://rust-lang.org/)
106106

107107
應該選擇哪一種模式了呢?由你自己來做決定!每個模式都有優點,也有缺點。雖然上面的描述乍一看,這三種模式有着很大的不同,其實不然,它們還是有着共同點的。如果你對上述三種模式有興趣,可以採用下面的模版:
108108

script/html-proofer

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ url_ignores = [
2525
%r{^https?://(www\.)?reddit\.com},
2626
%r{^https://rockwoodleadership\.org/},
2727
%r{^https://(www\.)?npmjs\.com},
28+
%r{^https://(www\.)?quora\.com},
2829
]
2930

3031
HTMLProofer::Runner.new(

0 commit comments

Comments
 (0)