Skip to content

Commit a78994c

Browse files
Merge branch 'master' into ticket-1052
2 parents aa3186b + e9a0c10 commit a78994c

25 files changed

+55
-49
lines changed

Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ GEM
66
minitest (~> 5.1)
77
thread_safe (~> 0.3, >= 0.3.4)
88
tzinfo (~> 1.1)
9-
addressable (2.6.0)
10-
public_suffix (>= 2.0.2, < 4.0)
9+
addressable (2.7.0)
10+
public_suffix (>= 2.0.2, < 5.0)
1111
coffee-script (2.4.1)
1212
coffee-script-source
1313
execjs
@@ -30,7 +30,7 @@ GEM
3030
ffi (1.11.1)
3131
forwardable-extended (2.6.0)
3232
gemoji (3.0.1)
33-
github-pages (198)
33+
github-pages (200)
3434
activesupport (= 4.2.11.1)
3535
github-pages-health-check (= 1.16.1)
3636
jekyll (= 3.8.5)
@@ -47,7 +47,7 @@ GEM
4747
jekyll-readme-index (= 0.2.0)
4848
jekyll-redirect-from (= 0.14.0)
4949
jekyll-relative-links (= 0.6.0)
50-
jekyll-remote-theme (= 0.3.1)
50+
jekyll-remote-theme (= 0.4.0)
5151
jekyll-sass-converter (= 1.5.2)
5252
jekyll-seo-tag (= 2.5.0)
5353
jekyll-sitemap (= 1.2.0)
@@ -72,7 +72,7 @@ GEM
7272
listen (= 3.1.5)
7373
mercenary (~> 0.3)
7474
minima (= 2.5.0)
75-
nokogiri (>= 1.8.5, < 2.0)
75+
nokogiri (>= 1.10.4, < 2.0)
7676
rouge (= 2.2.1)
7777
terminal-table (~> 1.4)
7878
github-pages-health-check (1.16.1)
@@ -84,11 +84,10 @@ GEM
8484
html-pipeline (2.12.0)
8585
activesupport (>= 2)
8686
nokogiri (>= 1.4)
87-
html-proofer (3.11.1)
88-
activesupport (>= 4.2, < 6.0)
87+
html-proofer (3.12.2)
8988
addressable (~> 2.3)
90-
mercenary (~> 0.3.2)
91-
nokogiri (~> 1.9)
89+
mercenary (~> 0.3)
90+
nokogiri (~> 1.10)
9291
parallel (~> 1.3)
9392
rainbow (~> 3.0)
9493
typhoeus (~> 1.3)
@@ -142,7 +141,8 @@ GEM
142141
jekyll (~> 3.3)
143142
jekyll-relative-links (0.6.0)
144143
jekyll (~> 3.3)
145-
jekyll-remote-theme (0.3.1)
144+
jekyll-remote-theme (0.4.0)
145+
addressable (~> 2.0)
146146
jekyll (~> 3.5)
147147
rubyzip (>= 1.2.1, < 3.0)
148148
jekyll-sass-converter (1.5.2)
@@ -231,7 +231,7 @@ GEM
231231
ruby-enum (0.7.2)
232232
i18n
233233
ruby_dep (1.5.0)
234-
rubyzip (1.2.3)
234+
rubyzip (1.2.4)
235235
safe_yaml (1.0.5)
236236
sass (3.7.4)
237237
sass-listen (~> 4.0.0)

_articles/best-practices.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ There are a [variety of tools available](https://github.com/showcases/tools-for-
243243
* [semantic-release](https://github.com/semantic-release/semantic-release) automates your releases
244244
* [mention-bot](https://github.com/facebook/mention-bot) mentions potential reviewers for pull requests
245245
* [Danger](https://github.com/danger/danger) helps automate code review
246+
* [no-response](https://github.com/probot/no-response) closes issues where the author hasn't responded to a request for more information
247+
* [dependabot-preview](https://github.com/marketplace/dependabot-preview) checks your dependency files every day for outdated requirements and opens individual pull requests for any it finds
246248

247249
For bug reports and other common contributions, GitHub has [Issue Templates and Pull Request Templates](https://github.com/blog/2111-issue-and-pull-request-templates), which you can create to streamline the communication you receive. @TalAter made a [Choose Your Own Adventure guide](https://www.talater.com/open-source-templates/#/) to help you write your issue and PR templates.
248250

_articles/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ Any popular project will inevitably attract people who harm, rather than help, y
118118
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.
119119

120120
<aside markdown="1" class="pquote">
121-
<img src="https://avatars.githubusercontent.com/karissa?s=180" class="pquote-avatar" alt="avatar">
121+
<img src="https://avatars.githubusercontent.com/okdistribute?s=180" class="pquote-avatar" alt="avatar">
122122
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.
123123
<p markdown="1" class="pquote-credit">
124-
@karissa, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
124+
@okdistribute, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
125125
</p>
126126
</aside>
127127

_articles/de/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ Jedes populäre Projekt wird unweigerlich Menschen anziehen, die Ihrer Gemeinsch
123123
Tun Sie Ihr Bestes, um eine Null-Toleranz-Politik gegenüber solchen Leuten zu verfolgen. Denn wenn obiges Verhalten unsanktioniert bleibt, werden andere Kontributor\*innen sich genervt fühlen und evtl. sogar Ihr Projekt verlassen.
124124

125125
<aside markdown="1" class="pquote">
126-
<img src="https://avatars.githubusercontent.com/karissa?s=180" class="pquote-avatar" alt="avatar">
126+
<img src="https://avatars.githubusercontent.com/okdistribute?s=180" class="pquote-avatar" alt="avatar">
127127

128128
Es ist wahrlich wichtig, eine unterstützende Gemeinschaft zu haben. Ohne die Hilfe meiner Kollegen\*innen, freundlicher Fremder aus dem Internet und gesprächiger IRC-Kanäle wäre ich nie in der Lage, diese Arbeit zu tun. (...) Geben Sie sich nicht mit weniger zufrieden. Geben Sie sich nicht mit Arschlöchern zufrieden.
129129

130130
_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._
131131

132132
<p markdown="1" class="pquote-credit">
133-
@karissa, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
133+
@okdistribute, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
134134
</p>
135135
</aside>
136136

_articles/de/getting-paid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Wenn Ihr Unternehmen diesen Weg einschlägt, ist es wichtig, die Grenzen zwische
121121
Wenn Sie Ihren derzeitigen Arbeitgeber nicht davon überzeugen können, Open-Source-Arbeit zu priorisieren, sollten Sie sich überlegen, einen neuen Arbeitgeber zu finden, der Mitarbeit an Open Source fördert. Zum Beispiel:
122122

123123
* Manche Firmen, wie [Netflix](https://netflix.github.io/) oder [PayPal](https://paypal.github.io/), zeigen ihr Open-Source-Engagement auf ihren Webseiten
124-
* [Rackspace](https://www.rackspace.com/en-us) veröffentlicht seine [Open-Source-Beitragsrichtlinie](https://blog.rackspace.com/rackspaces-policy-on-contributing-to-open-source/) für Angestellte
124+
* [Zalando](https://opensource.zalando.com) veröffentlicht seine [Open-Source-Beitragsrichtlinie](https://opensource.zalando.com/docs/using/contributing/) für Angestellte
125125

126126
Aus einer großen Firma stammende Projekte, wie z.B. [Go](https://github.com/golang) oder [React](https://github.com/facebook/react), stellen vermutlich auch weiterhin Leute für Open-Source-Arbeit an.
127127

_articles/es/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ Cualquier proyecto popular inevitablemente atraer&aacute; a personas que perjudi
113113
Haz todo lo posible para adoptar una pol&iacute;tica de tolerancia cero hacia este tipo de personas. Si no se controla, las personas negativas har&aacute;n que otras personas de tu comunidad se sientan inc&oacute;modas. Incluso pueden irse.
114114

115115
<aside markdown="1" class="pquote">
116-
<img src="https://avatars.githubusercontent.com/karissa?s=180" class="pquote-avatar" alt="avatar">
116+
<img src="https://avatars.githubusercontent.com/okdistribute?s=180" class="pquote-avatar" alt="avatar">
117117
La verdad es que tener una comunidad de apoyo es clave. Nunca hubiera sido capaz de realizar este trabajo sin la ayuda de mis colegas, los extra&ntilde;os de internet que fueron amigables y los canales IRC de conversaci&oacute;n. (...) No te conformes con menos. No te conformes con los idiotas.
118118
<p markdown="1" class="pquote-credit">
119-
@karissa, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
119+
@okdistribute, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
120120
</p>
121121
</aside>
122122

_articles/es/getting-paid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Si tu empresa va por esta ruta, es importante mantener clara la relaci&oacute;n
9595
Si no pueden convencer a tu actual empleador de priorizar un trabajo de c&oacute;digo abierto, considera encontrar un nuevo empleador que motive a los empleados a contribuir. Busca empresas que hagan su dedicaci&oacute;n al c&oacute;digo abierto expl&iacute;cita. Por ejemplo:
9696

9797
* Algunas empresas, como [Netflix](https://netflix.github.io/) o [PayPal](https://paypal.github.io/), tienen p&aacute;ginas web que resaltan su participaci&oacute;n en el c&oacute;digo abierto.
98-
* [Rackspace](https://www.rackspace.com/en-us) publico su [pol&iacute;ticas de contribuci&oacute;n al c&oacute;digo abierto](https://blog.rackspace.com/rackspaces-policy-on-contributing-to-open-source/) para empleados.
98+
* [Zalando](https://opensource.zalando.com) publico su [pol&iacute;ticas de contribuci&oacute;n al c&oacute;digo abierto](https://opensource.zalando.com/docs/using/contributing/) para empleados.
9999

100100
Proyectos que se originaron en una empresa grande, como [Go](https://github.com/golang) o [React](https://github.com/facebook/react), ser&aacute;n susceptibles a contratar personas que trabajen en c&oacute;digo abierto.
101101

_articles/fr/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ Tout projet populaire attirera inévitablement des gens qui nuisent à votre com
113113
Faites de votre mieux pour adopter une politique de tolérance zéro envers ces types de personnes. Si rien n'est fait, les personnes négatives mettront mal à l'aise les autres membres de votre communauté. Ils peuvent même partir.
114114

115115
<aside markdown="1" class="pquote">
116-
<img src="https://avatars.githubusercontent.com/karissa?s=180" class="pquote-avatar" alt="avatar">
116+
<img src="https://avatars.githubusercontent.com/okdistribute?s=180" class="pquote-avatar" alt="avatar">
117117
La vérité est qu'ayant une communauté de soutien est la clé. Je ne serais jamais capable de faire ce travail sans l'aide de mes collègues, des étrangers sympathiques sur Internet, et des canaux IRC bavards. (...) Ne vous contentez pas de moins. Ne vous contentez pas de connards.
118118
<p markdown="1" class="pquote-credit">
119-
@karissa, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
119+
@okdistribute, ["How to Run a FOSS Project"](https://okdistribute.xyz/post/okf-de)
120120
</p>
121121
</aside>
122122

_articles/fr/getting-paid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Si votre entreprise suit cette voie, il est important de garder les limites entr
9595
Si vous ne pouvez pas convaincre votre employeur actuel d'accorder la priorité au travail open source, envisagez de trouver un nouvel employeur qui encourage les contributions des employés à l'open source. Cherchez des entreprises qui rendent explicite leur dévouement au travail open source. Par exemple :
9696

9797
* Certaines entreprises, comme [Netflix](https://netflix.github.io/) ou [PayPal](https://paypal.github.io/), ont des sites Web qui soulignent leur implication dans l'open source
98-
* [Rackspace](https://www.rackspace.com/en-us) a publié sa [politique de contribution open source](https://blog.rackspace.com/rackspaces-policy-on-contributing-to-open-source/) pour les employés
98+
* [Zalando](https://opensource.zalando.com) a publié sa [politique de contribution open source](https://opensource.zalando.com/docs/using/contributing/) pour les employés
9999

100100
Les projets provenant d'une grande entreprise, tels que [Go](https://github.com/golang) ou [React](https://github.com/facebook/react), emploieront probablement des personnes pour travailler sur Open source.
101101

_articles/getting-paid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ If your company goes down this route, it's important to keep the boundaries betw
100100
If you can't convince your current employer to prioritize open source work, consider finding a new employer that encourages employee contributions to open source. Look for companies that make their dedication to open source work explicit. For example:
101101

102102
* Some companies, like [Netflix](https://netflix.github.io/) or [PayPal](https://paypal.github.io/), have websites that highlight their involvement in open source
103-
* [Rackspace](https://www.rackspace.com/en-us) published its [open source contribution policy](https://blog.rackspace.com/rackspaces-policy-on-contributing-to-open-source/) for employees
103+
* [Zalando](https://opensource.zalando.com) published its [open source contribution policy](https://opensource.zalando.com/docs/using/contributing/) for employees
104104

105105
Projects that originated at a large company, such as [Go](https://github.com/golang) or [React](https://github.com/facebook/react), will also likely employ people to work on open source.
106106

0 commit comments

Comments
 (0)