Skip to content

Commit 5ed4fa2

Browse files
authored
Merge pull request #304 from rubyberlin/switch_to_jekyll
Switch to Jekyll
2 parents 92db187 + 084b7d8 commit 5ed4fa2

File tree

37 files changed

+429
-447
lines changed

37 files changed

+429
-447
lines changed

.gitignore

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
2-
#
3-
# If you find yourself ignoring temporary files generated by your text editor
4-
# or operating system, you probably want to add a global ignore instead:
5-
# git config --global core.excludesfile ~/.gitignore_global
6-
7-
# Ignore bundler config
8-
/.bundle
9-
10-
# Ignore the build directory
11-
/build
12-
13-
# Ignore Sass' cache
14-
/.sass-cache
15-
16-
# Ignore .DS_store file
17-
.DS_Store
1+
/_site
File renamed without changes.

Gemfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
11
source 'https://rubygems.org'
2-
3-
gem "middleman"
4-
5-
# Live-reloading plugin
6-
gem "middleman-livereload"
7-
8-
# deploy to github pages
9-
gem "middleman-deploy"
10-
11-
# For faster file watcher updates on Windows:
12-
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
2+
gem 'jekyll', '~> 4.4'

Gemfile.lock

Lines changed: 116 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,126 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.1.16)
5-
i18n (~> 0.6, >= 0.6.9)
6-
json (~> 1.7, >= 1.7.7)
7-
minitest (~> 5.1)
8-
thread_safe (~> 0.1)
9-
tzinfo (~> 1.1)
10-
celluloid (0.15.2)
11-
timers (~> 1.1.0)
12-
chunky_png (1.3.1)
13-
coffee-script (2.3.0)
14-
coffee-script-source
15-
execjs
16-
coffee-script-source (1.7.1)
17-
compass (1.0.1)
18-
chunky_png (~> 1.2)
19-
compass-core (~> 1.0.1)
20-
compass-import-once (~> 1.0.5)
21-
rb-fsevent (>= 0.9.3)
22-
rb-inotify (>= 0.9)
23-
sass (>= 3.3.13, < 3.5)
24-
compass-core (1.0.1)
25-
multi_json (~> 1.0)
26-
sass (>= 3.3.0, < 3.5)
27-
compass-import-once (1.0.5)
28-
sass (>= 3.2, < 3.5)
29-
em-websocket (0.5.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
base64 (0.3.0)
7+
bigdecimal (3.2.2)
8+
colorator (1.1.0)
9+
concurrent-ruby (1.3.5)
10+
csv (3.3.5)
11+
em-websocket (0.5.3)
3012
eventmachine (>= 0.12.9)
31-
http_parser.rb (~> 0.5.3)
32-
erubis (2.7.0)
33-
eventmachine (1.0.7)
34-
execjs (2.8.1)
35-
ffi (1.11.1)
36-
haml (5.1.2)
37-
temple (>= 0.8.0)
38-
tilt
39-
hike (1.2.3)
40-
hooks (0.4.0)
41-
uber (~> 0.0.4)
42-
http_parser.rb (0.5.3)
43-
i18n (0.6.11)
44-
json (1.8.6)
45-
kramdown (1.4.1)
46-
listen (2.7.9)
47-
celluloid (>= 0.15.2)
48-
rb-fsevent (>= 0.9.3)
49-
rb-inotify (>= 0.9)
50-
middleman (3.3.5)
51-
coffee-script (~> 2.2)
52-
compass (>= 0.12.4)
53-
compass-import-once (= 1.0.5)
54-
execjs (~> 2.0)
55-
haml (>= 4.0.5)
56-
kramdown (~> 1.2)
57-
middleman-core (= 3.3.5)
58-
middleman-sprockets (>= 3.1.2)
59-
sass (>= 3.2.17, < 4.0)
60-
uglifier (~> 2.5)
61-
middleman-core (3.3.5)
62-
activesupport (~> 4.1.0)
63-
bundler (~> 1.1)
64-
erubis
65-
hooks (~> 0.3)
66-
i18n (~> 0.6.9)
67-
listen (>= 2.7.9, < 3.0)
68-
padrino-helpers (~> 0.12.3)
69-
rack (>= 1.4.5, < 2.0)
70-
rack-test (~> 0.6.2)
71-
thor (>= 0.15.2, < 2.0)
72-
tilt (~> 1.4.1, < 2.0)
73-
middleman-deploy (0.2.4)
74-
middleman-core (>= 3.0.0)
75-
net-sftp
76-
ptools
77-
middleman-livereload (3.1.0)
78-
em-websocket (>= 0.2.0)
79-
middleman-core (>= 3.0.2)
80-
multi_json (~> 1.0)
81-
rack-livereload
82-
middleman-sprockets (3.3.9)
83-
middleman-core (~> 3.3)
84-
sprockets (~> 2.12.1)
85-
sprockets-helpers (~> 1.1.0)
86-
sprockets-sass (~> 1.2.0)
87-
minitest (5.13.0)
88-
multi_json (1.14.1)
89-
net-sftp (2.1.2)
90-
net-ssh (>= 2.6.5)
91-
net-ssh (2.9.1)
92-
padrino-helpers (0.12.3)
93-
i18n (~> 0.6, >= 0.6.7)
94-
padrino-support (= 0.12.3)
95-
tilt (~> 1.4.1)
96-
padrino-support (0.12.3)
97-
activesupport (>= 3.1)
98-
ptools (1.2.4)
99-
rack (1.6.12)
100-
rack-livereload (0.3.15)
101-
rack
102-
rack-test (0.6.2)
103-
rack (>= 1.0)
104-
rb-fsevent (0.9.4)
105-
rb-inotify (0.9.5)
106-
ffi (>= 0.5.0)
107-
sass (3.4.1)
108-
sprockets (2.12.5)
109-
hike (~> 1.2)
110-
multi_json (~> 1.0)
111-
rack (~> 1.0)
112-
tilt (~> 1.1, != 1.3.0)
113-
sprockets-helpers (1.1.0)
114-
sprockets (~> 2.0)
115-
sprockets-sass (1.2.0)
116-
sprockets (~> 2.0)
117-
tilt (~> 1.1)
118-
temple (0.8.2)
119-
thor (0.19.1)
120-
thread_safe (0.3.6)
121-
tilt (1.4.1)
122-
timers (1.1.0)
123-
tzinfo (1.2.10)
124-
thread_safe (~> 0.1)
125-
uber (0.0.8)
126-
uglifier (2.7.2)
127-
execjs (>= 0.3.0)
128-
json (>= 1.8.0)
13+
http_parser.rb (~> 0)
14+
eventmachine (1.2.7)
15+
ffi (1.17.2-aarch64-linux-gnu)
16+
ffi (1.17.2-aarch64-linux-musl)
17+
ffi (1.17.2-arm-linux-gnu)
18+
ffi (1.17.2-arm-linux-musl)
19+
ffi (1.17.2-arm64-darwin)
20+
ffi (1.17.2-x86_64-darwin)
21+
ffi (1.17.2-x86_64-linux-gnu)
22+
ffi (1.17.2-x86_64-linux-musl)
23+
forwardable-extended (2.6.0)
24+
google-protobuf (4.31.1)
25+
bigdecimal
26+
rake (>= 13)
27+
google-protobuf (4.31.1-aarch64-linux-gnu)
28+
bigdecimal
29+
rake (>= 13)
30+
google-protobuf (4.31.1-aarch64-linux-musl)
31+
bigdecimal
32+
rake (>= 13)
33+
google-protobuf (4.31.1-arm64-darwin)
34+
bigdecimal
35+
rake (>= 13)
36+
google-protobuf (4.31.1-x86_64-darwin)
37+
bigdecimal
38+
rake (>= 13)
39+
google-protobuf (4.31.1-x86_64-linux-gnu)
40+
bigdecimal
41+
rake (>= 13)
42+
google-protobuf (4.31.1-x86_64-linux-musl)
43+
bigdecimal
44+
rake (>= 13)
45+
http_parser.rb (0.8.0)
46+
i18n (1.14.7)
47+
concurrent-ruby (~> 1.0)
48+
jekyll (4.4.1)
49+
addressable (~> 2.4)
50+
base64 (~> 0.2)
51+
colorator (~> 1.0)
52+
csv (~> 3.0)
53+
em-websocket (~> 0.5)
54+
i18n (~> 1.0)
55+
jekyll-sass-converter (>= 2.0, < 4.0)
56+
jekyll-watch (~> 2.0)
57+
json (~> 2.6)
58+
kramdown (~> 2.3, >= 2.3.1)
59+
kramdown-parser-gfm (~> 1.0)
60+
liquid (~> 4.0)
61+
mercenary (~> 0.3, >= 0.3.6)
62+
pathutil (~> 0.9)
63+
rouge (>= 3.0, < 5.0)
64+
safe_yaml (~> 1.0)
65+
terminal-table (>= 1.8, < 4.0)
66+
webrick (~> 1.7)
67+
jekyll-sass-converter (3.1.0)
68+
sass-embedded (~> 1.75)
69+
jekyll-watch (2.2.1)
70+
listen (~> 3.0)
71+
json (2.12.2)
72+
kramdown (2.5.1)
73+
rexml (>= 3.3.9)
74+
kramdown-parser-gfm (1.1.0)
75+
kramdown (~> 2.0)
76+
liquid (4.0.4)
77+
listen (3.9.0)
78+
rb-fsevent (~> 0.10, >= 0.10.3)
79+
rb-inotify (~> 0.9, >= 0.9.10)
80+
mercenary (0.4.0)
81+
pathutil (0.16.2)
82+
forwardable-extended (~> 2.6)
83+
public_suffix (6.0.2)
84+
rake (13.3.0)
85+
rb-fsevent (0.11.2)
86+
rb-inotify (0.11.1)
87+
ffi (~> 1.0)
88+
rexml (3.4.1)
89+
rouge (4.5.2)
90+
safe_yaml (1.0.5)
91+
sass-embedded (1.89.2-aarch64-linux-gnu)
92+
google-protobuf (~> 4.31)
93+
sass-embedded (1.89.2-aarch64-linux-musl)
94+
google-protobuf (~> 4.31)
95+
sass-embedded (1.89.2-arm-linux-gnueabihf)
96+
google-protobuf (~> 4.31)
97+
sass-embedded (1.89.2-arm-linux-musleabihf)
98+
google-protobuf (~> 4.31)
99+
sass-embedded (1.89.2-arm64-darwin)
100+
google-protobuf (~> 4.31)
101+
sass-embedded (1.89.2-x86_64-darwin)
102+
google-protobuf (~> 4.31)
103+
sass-embedded (1.89.2-x86_64-linux-gnu)
104+
google-protobuf (~> 4.31)
105+
sass-embedded (1.89.2-x86_64-linux-musl)
106+
google-protobuf (~> 4.31)
107+
terminal-table (3.0.2)
108+
unicode-display_width (>= 1.1.1, < 3)
109+
unicode-display_width (2.6.0)
110+
webrick (1.9.1)
129111

130112
PLATFORMS
131-
ruby
113+
aarch64-linux-gnu
114+
aarch64-linux-musl
115+
arm-linux-gnu
116+
arm-linux-musl
117+
arm64-darwin
118+
x86_64-darwin
119+
x86_64-linux-gnu
120+
x86_64-linux-musl
132121

133122
DEPENDENCIES
134-
middleman
135-
middleman-deploy
136-
middleman-livereload
137-
wdm (~> 0.1.0)
123+
jekyll (~> 4.4)
138124

139125
BUNDLED WITH
140-
2.4.22
126+
2.6.9

README.md

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Berlin Code of Conduct
22
======================
33

4-
This code of conduct is online at: http://rubyberlin.github.io/code-of-conduct/
4+
This code of conduct is online at: https://berlincodeofconduct.org
55

66
Add Your User Group/Conference to the List
77
------------------------------------------
@@ -24,7 +24,7 @@ Additions or Changes to the Code of Conduct?
2424
--------------------------------------------
2525

2626
1. Fork repository.
27-
2. Open *source/localizable/_code-of-conduct.{locale}.md* and edit it.
27+
2. Open *{locale}.md* and edit it.
2828
3. Open a pull request and add some lines why you want it to be changed.
2929

3030

@@ -34,16 +34,14 @@ Translations
3434
Do you want to translate to another language? Great! If you want to translate from English (en) to Latin (la):
3535

3636
1. Fork repository.
37-
2. Copy [*source/localizable/_code-of-conduct.en.md*](https://github.com/rubyberlin/code-of-conduct/blob/master/source/localizable/_code-of-conduct.en.md) to *source/localizable/_code-of-conduct.la.md* and edit it.
38-
2. Copy [*locales/en.yml*](https://github.com/rubyberlin/code-of-conduct/blob/master/locales/en.yml) to *locales/la.yml* and edit it.
39-
3. Edit [*config.rb*](https://github.com/rubyberlin/code-of-conduct/blob/master/config.rb) and add 'la' to 'displayed_languages' like '%i(en de es pl fr it ru ja ar *la*)'
40-
4. Open a pull request. We will try to find other native speakers and discuss it there. The discussion may look like [the one for the Spanish translation](https://github.com/rubyberlin/code-of-conduct/pull/23).
37+
2. Copy [*en.md*](https://github.com/rubyberlin/code-of-conduct/blob/main/en.md) to *la.md* and edit it.
38+
3. Open a pull request. We will try to find other native speakers and discuss it there. The discussion may look like [the one for the Spanish translation](https://github.com/rubyberlin/code-of-conduct/pull/23).
4139

4240

4341
Setup
4442
-----
4543

46-
Ruby 2.x.y (1.9.x still OK) must be [installed](http://www.ruby-lang.org/de/downloads/).
44+
Ruby 2.7 or newer must be [installed](https://www.ruby-lang.org/en/downloads/).
4745

4846
git clone [email protected]:rubyberlin/code-of-conduct.git
4947
cd code-of-conduct
@@ -55,20 +53,12 @@ Development
5553
-----------
5654

5755
cd code-of-conduct
58-
bundle exec middleman
56+
bundle exec jekyll serve
5957

60-
You can access the website at <http://localhost:4567/>.
58+
You can access the website at <http://127.0.0.1:4000/>.
6159

6260

6361
Deployment
6462
----------
6563

66-
Building the website:
67-
68-
cd code-of-conduct
69-
bundle exec middleman build
70-
71-
Deploying to github pages (needs push access to this repository):
72-
73-
cd code-of-conduct
74-
bundle exec middleman deploy
64+
Deploying to GitHub Pages should happen automatically on merges to the `main` branch. 🤞

_config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
defaults:
2+
-
3+
values:
4+
layout: default
File renamed without changes.

0 commit comments

Comments
 (0)