Skip to content

Commit e8dbe96

Browse files
authored
Merge branch 'master' into translation
2 parents 2a7da37 + fcefca6 commit e8dbe96

Some content is hidden

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

56 files changed

+2685
-251
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
- [ ] Have you followed the [contributing guidelines](https://github.com/github/opensource.guide/blob/master/CONTRIBUTING.md)?
22
- [ ] Have you explained what your changes do, and why they add value to the Guides?
3-
- [ ] Have you enabled GitHub Pages Previews by pressing <keyboard>`Enable GitHub Pages`</keyboard> on the right sidebar to trigger a pages build for this PR?
43

54
**Please note: we will close your PR without comment if you do not check the boxes above and provide ALL requested information.**
65

.github/main.workflow

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
workflow "Test and build on push" {
2+
resolves = ["Jekyll Pages Builder"]
3+
on = "pull_request"
4+
}
5+
6+
action "CI Test Runner" {
7+
uses = "./.github/test_runner"
8+
secrets = ["GITHUB_TOKEN"]
9+
}
10+
11+
action "Jekyll Pages Builder" {
12+
needs = "CI Test Runner"
13+
uses = "./.github/pages_builder"
14+
secrets = ["GITHUB_TOKEN"]
15+
}

.github/pages_builder/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM jekyll/jekyll
2+
3+
LABEL "com.github.actions.name"="Jekyll Pages Builder"
4+
LABEL "com.github.actions.description"="Build the full jekyll pages site"
5+
LABEL "com.github.actions.icon"="gear"
6+
LABEL "com.github.actions.color"="purple"
7+
8+
ENV LC_ALL C.UTF-8
9+
ENV LANG en_US.UTF-8
10+
ENV LANGUAGE en_US.UTF-8
11+
12+
COPY entrypoint.sh /
13+
14+
ENTRYPOINT ["/entrypoint.sh"]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh -l
2+
3+
script/bootstrap
4+
cd test && npm install && cd ..
5+
JEKYLL_GITHUB_TOKEN=$GITHUB_TOKEN script/build

.github/test_runner/Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM jekyll/jekyll
2+
3+
LABEL "com.github.actions.name"="CI Test Runner"
4+
LABEL "com.github.actions.description"="Run the full test suite"
5+
LABEL "com.github.actions.icon"="gear"
6+
LABEL "com.github.actions.color"="purple"
7+
8+
ENV LC_ALL C.UTF-8
9+
ENV LANG en_US.UTF-8
10+
ENV LANGUAGE en_US.UTF-8
11+
12+
COPY entrypoint.sh /
13+
14+
ENTRYPOINT ["/entrypoint.sh"]

.github/test_runner/entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh -l
2+
3+
script/bootstrap
4+
cd test && npm install && cd ..
5+
JEKYLL_GITHUB_TOKEN=$GITHUB_TOKEN script/test

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
sudo: false
21
language: node_js
32
node_js:
43
- 6

Gemfile.lock

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.10)
4+
activesupport (4.2.11.1)
55
i18n (~> 0.7)
66
minitest (~> 5.1)
77
thread_safe (~> 0.3, >= 0.3.4)
88
tzinfo (~> 1.1)
9-
addressable (2.5.2)
9+
addressable (2.6.0)
1010
public_suffix (>= 2.0.2, < 4.0)
1111
coffee-script (2.4.1)
1212
coffee-script-source
1313
execjs
1414
coffee-script-source (1.11.1)
1515
colorator (1.1.0)
16-
colorize (0.8.1)
1716
commonmarker (0.17.13)
1817
ruby-enum (~> 0.5)
19-
concurrent-ruby (1.1.4)
18+
concurrent-ruby (1.1.5)
2019
dnsruby (1.61.2)
2120
addressable (~> 2.5)
2221
em-websocket (0.5.1)
@@ -28,26 +27,26 @@ GEM
2827
execjs (2.7.0)
2928
faraday (0.15.4)
3029
multipart-post (>= 1.2, < 3)
31-
ffi (1.10.0)
30+
ffi (1.11.1)
3231
forwardable-extended (2.6.0)
33-
gemoji (3.0.0)
34-
github-pages (193)
35-
activesupport (= 4.2.10)
36-
github-pages-health-check (= 1.8.1)
37-
jekyll (= 3.7.4)
32+
gemoji (3.0.1)
33+
github-pages (198)
34+
activesupport (= 4.2.11.1)
35+
github-pages-health-check (= 1.16.1)
36+
jekyll (= 3.8.5)
3837
jekyll-avatar (= 0.6.0)
3938
jekyll-coffeescript (= 1.1.1)
4039
jekyll-commonmark-ghpages (= 0.1.5)
4140
jekyll-default-layout (= 0.1.4)
4241
jekyll-feed (= 0.11.0)
4342
jekyll-gist (= 1.5.0)
44-
jekyll-github-metadata (= 2.9.4)
43+
jekyll-github-metadata (= 2.12.1)
4544
jekyll-mentions (= 1.4.1)
4645
jekyll-optional-front-matter (= 0.3.0)
4746
jekyll-paginate (= 1.1.0)
4847
jekyll-readme-index (= 0.2.0)
4948
jekyll-redirect-from (= 0.14.0)
50-
jekyll-relative-links (= 0.5.3)
49+
jekyll-relative-links (= 0.6.0)
5150
jekyll-remote-theme (= 0.3.1)
5251
jekyll-sass-converter (= 1.5.2)
5352
jekyll-seo-tag (= 2.5.0)
@@ -67,37 +66,37 @@ GEM
6766
jekyll-theme-tactile (= 0.1.1)
6867
jekyll-theme-time-machine (= 0.1.1)
6968
jekyll-titles-from-headings (= 0.5.1)
70-
jemoji (= 0.10.1)
69+
jemoji (= 0.10.2)
7170
kramdown (= 1.17.0)
7271
liquid (= 4.0.0)
7372
listen (= 3.1.5)
7473
mercenary (~> 0.3)
7574
minima (= 2.5.0)
76-
nokogiri (>= 1.8.2, < 2.0)
75+
nokogiri (>= 1.8.5, < 2.0)
7776
rouge (= 2.2.1)
7877
terminal-table (~> 1.4)
79-
github-pages-health-check (1.8.1)
78+
github-pages-health-check (1.16.1)
8079
addressable (~> 2.3)
8180
dnsruby (~> 1.60)
8281
octokit (~> 4.0)
83-
public_suffix (~> 2.0)
82+
public_suffix (~> 3.0)
8483
typhoeus (~> 1.3)
85-
html-pipeline (2.10.0)
84+
html-pipeline (2.11.0)
8685
activesupport (>= 2)
8786
nokogiri (>= 1.4)
88-
html-proofer (3.10.2)
87+
html-proofer (3.11.0)
8988
activesupport (>= 4.2, < 6.0)
9089
addressable (~> 2.3)
91-
colorize (~> 0.8)
9290
mercenary (~> 0.3.2)
9391
nokogiri (~> 1.9)
9492
parallel (~> 1.3)
93+
rainbow (~> 3.0)
9594
typhoeus (~> 1.3)
9695
yell (~> 2.0)
9796
http_parser.rb (0.6.0)
9897
i18n (0.9.5)
9998
concurrent-ruby (~> 1.0)
100-
jekyll (3.7.4)
99+
jekyll (3.8.5)
101100
addressable (~> 2.4)
102101
colorator (~> 1.0)
103102
em-websocket (~> 0.5)
@@ -115,9 +114,9 @@ GEM
115114
jekyll-coffeescript (1.1.1)
116115
coffee-script (~> 2.2)
117116
coffee-script-source (~> 1.11.1)
118-
jekyll-commonmark (1.2.0)
117+
jekyll-commonmark (1.3.1)
119118
commonmarker (~> 0.14)
120-
jekyll (>= 3.0, < 4.0)
119+
jekyll (>= 3.7, < 5.0)
121120
jekyll-commonmark-ghpages (0.1.5)
122121
commonmarker (~> 0.17.6)
123122
jekyll-commonmark (~> 1)
@@ -128,8 +127,8 @@ GEM
128127
jekyll (~> 3.3)
129128
jekyll-gist (1.5.0)
130129
octokit (~> 4.2)
131-
jekyll-github-metadata (2.9.4)
132-
jekyll (~> 3.1)
130+
jekyll-github-metadata (2.12.1)
131+
jekyll (~> 3.4)
133132
octokit (~> 4.0, != 4.4.0)
134133
jekyll-mentions (1.4.1)
135134
html-pipeline (~> 2.3)
@@ -141,7 +140,7 @@ GEM
141140
jekyll (~> 3.0)
142141
jekyll-redirect-from (0.14.0)
143142
jekyll (~> 3.3)
144-
jekyll-relative-links (0.5.3)
143+
jekyll-relative-links (0.6.0)
145144
jekyll (~> 3.3)
146145
jekyll-remote-theme (0.3.1)
147146
jekyll (~> 3.5)
@@ -195,9 +194,9 @@ GEM
195194
jekyll-seo-tag (~> 2.0)
196195
jekyll-titles-from-headings (0.5.1)
197196
jekyll (~> 3.3)
198-
jekyll-watch (2.1.2)
197+
jekyll-watch (2.2.1)
199198
listen (~> 3.0)
200-
jemoji (0.10.1)
199+
jemoji (0.10.2)
201200
gemoji (~> 3.0)
202201
html-pipeline (~> 2.2)
203202
jekyll (~> 3.0)
@@ -214,15 +213,16 @@ GEM
214213
jekyll-feed (~> 0.9)
215214
jekyll-seo-tag (~> 2.1)
216215
minitest (5.11.3)
217-
multipart-post (2.0.0)
218-
nokogiri (1.10.1)
216+
multipart-post (2.1.1)
217+
nokogiri (1.10.3)
219218
mini_portile2 (~> 2.4.0)
220-
octokit (4.13.0)
219+
octokit (4.14.0)
221220
sawyer (~> 0.8.0, >= 0.5.3)
222-
parallel (1.13.0)
221+
parallel (1.17.0)
223222
pathutil (0.16.2)
224223
forwardable-extended (~> 2.6)
225-
public_suffix (2.0.5)
224+
public_suffix (3.1.1)
225+
rainbow (3.0.0)
226226
rake (12.3.2)
227227
rb-fsevent (0.10.3)
228228
rb-inotify (0.10.0)
@@ -231,25 +231,25 @@ GEM
231231
ruby-enum (0.7.2)
232232
i18n
233233
ruby_dep (1.5.0)
234-
rubyzip (1.2.2)
235-
safe_yaml (1.0.4)
236-
sass (3.7.3)
234+
rubyzip (1.2.3)
235+
safe_yaml (1.0.5)
236+
sass (3.7.4)
237237
sass-listen (~> 4.0.0)
238238
sass-listen (4.0.0)
239239
rb-fsevent (~> 0.9, >= 0.9.4)
240240
rb-inotify (~> 0.9, >= 0.9.7)
241-
sawyer (0.8.1)
242-
addressable (>= 2.3.5, < 2.6)
243-
faraday (~> 0.8, < 1.0)
241+
sawyer (0.8.2)
242+
addressable (>= 2.3.5)
243+
faraday (> 0.8, < 2.0)
244244
terminal-table (1.8.0)
245245
unicode-display_width (~> 1.1, >= 1.1.1)
246246
thread_safe (0.3.6)
247247
typhoeus (1.3.1)
248248
ethon (>= 0.9.0)
249249
tzinfo (1.2.5)
250250
thread_safe (~> 0.1)
251-
unicode-display_width (1.4.1)
252-
yell (2.0.7)
251+
unicode-display_width (1.6.0)
252+
yell (2.2.0)
253253

254254
PLATFORMS
255255
ruby

_articles/building-community.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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), _"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://kentcdodds.com/blog/first-timers-only), _"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

_articles/de/building-community.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Geben Sie in Ihrer CONTRIBUTING-Datei explizit an, wie sie anfangen sollen. Viel
146146

147147
![Djangos Startseite für neue Mitwirkende](/assets/images/building-community/django_new_contributors.png)
148148

149-
Die Liste der Issues sollte durchsortiert sein, Bugs z.B. als solche markiert, sowie Issues auch für unterschiedliche potentielle Kontributor\*innen: z.B. [_"first timers only"_](https://medium.com/@kentcdodds/first-timers-only-78281ea47455), _"good first issue"_, oder _"documentation"_. [Solche "Labels"](https://github.com/librariesio/libraries.io/blob/6afea1a3354aef4672d9b3a9fc4cc308d60020c8/app/models/github_issue.rb#L8-L14) vereinfachen es Neuankömmlingen, sich in Ihrem Projekt zurechtzufinden und mit der Lösung eines Problems zu beginnen.
149+
Die Liste der Issues sollte durchsortiert sein, Bugs z.B. als solche markiert, sowie Issues auch für unterschiedliche potentielle Kontributor\*innen: z.B. [_"first timers only"_](https://kentcdodds.com/blog/first-timers-only), _"good first issue"_, oder _"documentation"_. [Solche "Labels"](https://github.com/librariesio/libraries.io/blob/6afea1a3354aef4672d9b3a9fc4cc308d60020c8/app/models/github_issue.rb#L8-L14) vereinfachen es Neuankömmlingen, sich in Ihrem Projekt zurechtzufinden und mit der Lösung eines Problems zu beginnen.
150150

151151
Nicht zuletzt sollten Sie die Dokumentation nutzen, um Leute mit offenen Armen zu empfangen und ihnen Schritt-für-Schritt zu helfen.
152152

0 commit comments

Comments
 (0)