Skip to content

Commit 297d12f

Browse files
authored
Merge branch 'master' into translation
2 parents 0f8d24d + 2eb8e55 commit 297d12f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3094
-312
lines changed

Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ GEM
1616
colorize (0.8.1)
1717
commonmarker (0.17.13)
1818
ruby-enum (~> 0.5)
19-
concurrent-ruby (1.0.5)
19+
concurrent-ruby (1.1.3)
2020
dnsruby (1.61.2)
2121
addressable (~> 2.5)
2222
em-websocket (0.5.1)
@@ -26,20 +26,20 @@ GEM
2626
ffi (>= 1.3.0)
2727
eventmachine (1.2.7)
2828
execjs (2.7.0)
29-
faraday (0.15.2)
29+
faraday (0.15.3)
3030
multipart-post (>= 1.2, < 3)
3131
ffi (1.9.25)
3232
forwardable-extended (2.6.0)
3333
gemoji (3.0.0)
34-
github-pages (192)
34+
github-pages (193)
3535
activesupport (= 4.2.10)
3636
github-pages-health-check (= 1.8.1)
3737
jekyll (= 3.7.4)
3838
jekyll-avatar (= 0.6.0)
3939
jekyll-coffeescript (= 1.1.1)
4040
jekyll-commonmark-ghpages (= 0.1.5)
4141
jekyll-default-layout (= 0.1.4)
42-
jekyll-feed (= 0.10.0)
42+
jekyll-feed (= 0.11.0)
4343
jekyll-gist (= 1.5.0)
4444
jekyll-github-metadata (= 2.9.4)
4545
jekyll-mentions (= 1.4.1)
@@ -82,7 +82,7 @@ GEM
8282
octokit (~> 4.0)
8383
public_suffix (~> 2.0)
8484
typhoeus (~> 1.3)
85-
html-pipeline (2.8.4)
85+
html-pipeline (2.9.1)
8686
activesupport (>= 2)
8787
nokogiri (>= 1.4)
8888
html-proofer (3.9.2)
@@ -124,7 +124,7 @@ GEM
124124
rouge (~> 2)
125125
jekyll-default-layout (0.1.4)
126126
jekyll (~> 3.0)
127-
jekyll-feed (0.10.0)
127+
jekyll-feed (0.11.0)
128128
jekyll (~> 3.3)
129129
jekyll-gist (1.5.0)
130130
octokit (~> 4.2)
@@ -195,7 +195,7 @@ GEM
195195
jekyll-seo-tag (~> 2.0)
196196
jekyll-titles-from-headings (0.5.1)
197197
jekyll (~> 3.3)
198-
jekyll-watch (2.0.0)
198+
jekyll-watch (2.1.2)
199199
listen (~> 3.0)
200200
jemoji (0.10.1)
201201
gemoji (~> 3.0)
@@ -217,10 +217,10 @@ GEM
217217
multipart-post (2.0.0)
218218
nokogiri (1.8.5)
219219
mini_portile2 (~> 2.3.0)
220-
octokit (4.11.0)
220+
octokit (4.13.0)
221221
sawyer (~> 0.8.0, >= 0.5.3)
222222
parallel (1.12.1)
223-
pathutil (0.16.1)
223+
pathutil (0.16.2)
224224
forwardable-extended (~> 2.6)
225225
public_suffix (2.0.5)
226226
rake (12.3.1)
@@ -233,7 +233,7 @@ GEM
233233
ruby_dep (1.5.0)
234234
rubyzip (1.2.2)
235235
safe_yaml (1.0.4)
236-
sass (3.5.7)
236+
sass (3.7.2)
237237
sass-listen (~> 4.0.0)
238238
sass-listen (4.0.0)
239239
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -244,7 +244,7 @@ GEM
244244
terminal-table (1.8.0)
245245
unicode-display_width (~> 1.1, >= 1.1.1)
246246
thread_safe (0.3.6)
247-
typhoeus (1.3.0)
247+
typhoeus (1.3.1)
248248
ethon (>= 0.9.0)
249249
tzinfo (1.2.5)
250250
thread_safe (~> 0.1)

_articles/best-practices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ If you receive a contribution you don't want to accept, your first reaction migh
112112

113113
Don't leave an unwanted contribution open because you feel guilty or want to be nice. Over time, your unanswered issues and PRs will make working on your project feel that much more stressful and intimidating.
114114

115-
It's better to immediately close the contributions you know you don't want to accept. If your project already suffers from a large backlog, @steveklabnik has suggestions for [how to triage issues efficiently](http://words.steveklabnik.com/how-to-be-an-open-source-gardener).
115+
It's better to immediately close the contributions you know you don't want to accept. If your project already suffers from a large backlog, @steveklabnik has suggestions for [how to triage issues efficiently](https://words.steveklabnik.com/how-to-be-an-open-source-gardener).
116116

117117
Secondly, ignoring contributions sends a negative signal to your community. Contributing to a project can be intimidating, especially if it's someone's first time. Even if you don't accept their contribution, acknowledge the person behind it and thank them for their interest. It's a big compliment!
118118

@@ -180,15 +180,15 @@ Encouraging others to [share ownership of the project](../building-community/#sh
180180
<img src="https://avatars.githubusercontent.com/lmccart?s=180" class="pquote-avatar" alt="avatar">
181181
I’d been saying, "Yeah, anyone can be involved, you don’t have to have a lot of coding expertise [...]." We had people sign up to come [to an event] and that’s when I was really wondering: is this true, what I’ve been saying? There are gonna be 40 people who show up, and it’s not like I can sit with each of them...But people came together, and it just sort of worked. As soon as one person got it, they could teach their neighbor.
182182
<p markdown="1" class="pquote-credit">
183-
@lmccart, ["What Does "Open Source" Even Mean? p5.js Edition"](https://medium.com/@kenjagan/what-does-open-source-even-mean-p5-js-edition-98c02d354b39#.chnjlag7p)
183+
@lmccart, ["What Does "Open Source" Even Mean? p5.js Edition"](https://medium.com/@kenjagan/what-does-open-source-even-mean-p5-js-edition-98c02d354b39)
184184
</p>
185185
</aside>
186186

187187
If you need to step away from your project, either on hiatus or permanently, there's no shame in asking someone else to take over for you.
188188

189189
If other people are enthusiastic about its direction, give them commit access or formally hand over control to someone else. If someone forked your project and is actively maintaining it elsewhere, consider linking to the fork from your original project. It's great that so many people want your project to live on!
190190

191-
@progrium [found that](http://progrium.com/blog/2015/12/04/leadership-guilt-and-pull-requests/) documenting the vision for his project, [Dokku](https://github.com/dokku/dokku), helped those goals live on even after he stepped away from the project:
191+
@progrium [found that](https://progrium.com/blog/2015/12/04/leadership-guilt-and-pull-requests/) documenting the vision for his project, [Dokku](https://github.com/dokku/dokku), helped those goals live on even after he stepped away from the project:
192192

193193
> I wrote a wiki page describing what I wanted and why I wanted it. For some reason it came as a surprise to me that the maintainers started moving the project in that direction! Did it happen exactly how I'd do it? Not always. But it still brought the project closer to what I wrote down.
194194

_articles/building-community.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Encouraging other contributors is an investment in yourself, too. When you empow
5858
<img src="https://avatars.githubusercontent.com/janl?s=180" class="pquote-avatar" alt="avatar">
5959
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.
6060
<p markdown="1" class="pquote-credit">
61-
@janl, ["Sustainable Open Source"](http://writing.jan.io/2015/11/20/sustainable-open-source.html)
61+
@janl, ["Sustainable Open Source"](https://writing.jan.io/2015/11/20/sustainable-open-source.html)
6262
</p>
6363
</aside>
6464

@@ -120,7 +120,7 @@ Do your best to adopt a zero-tolerance policy towards these types of people. If
120120
<img src="https://avatars.githubusercontent.com/karissa?s=180" class="pquote-avatar" alt="avatar">
121121
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.
122122
<p markdown="1" class="pquote-credit">
123-
@karissa, ["How to Run a FOSS Project"](https://karissa.github.io/post/okf-de)
123+
@karissa, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
124124
</p>
125125
</aside>
126126

@@ -136,7 +136,7 @@ In your CONTRIBUTING file, explicitly tell new contributors how to get started.
136136

137137
![Django new contributors page](/assets/images/building-community/django_new_contributors.png)
138138

139-
In your issue queue, label bugs that are suitable for different types of contributors: for example, [_"first timers only"_](https://medium.com/@kentcdodds/first-timers-only-78281ea47455#.g1k01jy05), _"good first issue"_, or _"documentation"_. [These labels](https://github.com/librariesio/libraries.io/blob/6afea1a3354aef4672d9b3a9fc4cc308d60020c8/app/models/github_issue.rb#L8-L14) make it easy for someone new to your project to quickly scan your issues and get started.
139+
In your issue queue, label bugs that are suitable for different types of contributors: for example, [_"first timers only"_](https://medium.com/@kentcdodds/first-timers-only-78281ea47455), _"good first issue"_, or _"documentation"_. [These labels](https://github.com/librariesio/libraries.io/blob/6afea1a3354aef4672d9b3a9fc4cc308d60020c8/app/models/github_issue.rb#L8-L14) make it easy for someone new to your project to quickly scan your issues and get started.
140140

141141
Finally, use your documentation to make people feel welcome at every step of the way.
142142

@@ -152,7 +152,7 @@ For example, here's how [Rubinius](https://github.com/rubinius/rubinius/) starts
152152
<img src="https://avatars.githubusercontent.com/sarahsharp?s=180" class="pquote-avatar" alt="avatar">
153153
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.
154154
<p markdown="1" class="pquote-credit">
155-
@sarahsharp, ["What makes a good community?"](http://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
155+
@sarahsharp, ["What makes a good community?"](https://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
156156
</p>
157157
</aside>
158158

@@ -254,7 +254,7 @@ If a conversation clearly isn't going anywhere, there are no clear actions to be
254254
<img src="https://avatars.githubusercontent.com/kfogel?s=180" class="pquote-avatar" alt="avatar">
255255
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.
256256
<p markdown="1" class="pquote-credit">
257-
@kfogel, [_Producing OSS_](http://producingoss.com/en/producingoss.html#common-pitfalls)
257+
@kfogel, [_Producing OSS_](https://producingoss.com/en/producingoss.html#common-pitfalls)
258258
</p>
259259
</aside>
260260

0 commit comments

Comments
 (0)