Skip to content

Commit b676154

Browse files
authored
Merge pull request #3 from php-usergroup-dresden/lineup
2 parents 3d06666 + edd6dcc commit b676154

File tree

11 files changed

+121
-94
lines changed

11 files changed

+121
-94
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ source 'https://rubygems.org'
22

33
# 'github-pages' includes 'jekyll' gem
44
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
5-
gem 'github-pages', '~> 228', group: :jekyll_plugins
5+
gem 'github-pages', '~> 231', group: :jekyll_plugins
66
gem "webrick", "~> 1.8"

Gemfile.lock

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ GEM
1818
coffee-script (2.4.1)
1919
coffee-script-source
2020
execjs
21-
coffee-script-source (1.11.1)
21+
coffee-script-source (1.12.2)
2222
colorator (1.1.0)
2323
commonmarker (0.23.10)
2424
concurrent-ruby (1.3.3)
2525
connection_pool (2.4.1)
26-
dnsruby (1.72.1)
26+
dnsruby (1.72.2)
2727
simpleidn (~> 0.2.1)
2828
drb (2.2.1)
2929
em-websocket (0.5.3)
@@ -33,25 +33,26 @@ GEM
3333
ffi (>= 1.15.0)
3434
eventmachine (1.2.7)
3535
execjs (2.9.1)
36-
faraday (2.9.2)
36+
faraday (2.10.1)
3737
faraday-net_http (>= 2.0, < 3.2)
38-
faraday-net_http (3.1.0)
38+
logger
39+
faraday-net_http (3.1.1)
3940
net-http
4041
ffi (1.17.0-arm64-darwin)
4142
ffi (1.17.0-x86_64-darwin)
4243
ffi (1.17.0-x86_64-linux-gnu)
4344
forwardable-extended (2.6.0)
44-
gemoji (3.0.1)
45-
github-pages (228)
46-
github-pages-health-check (= 1.17.9)
47-
jekyll (= 3.9.3)
48-
jekyll-avatar (= 0.7.0)
49-
jekyll-coffeescript (= 1.1.1)
45+
gemoji (4.1.0)
46+
github-pages (231)
47+
github-pages-health-check (= 1.18.2)
48+
jekyll (= 3.9.5)
49+
jekyll-avatar (= 0.8.0)
50+
jekyll-coffeescript (= 1.2.2)
5051
jekyll-commonmark-ghpages (= 0.4.0)
51-
jekyll-default-layout (= 0.1.4)
52-
jekyll-feed (= 0.15.1)
52+
jekyll-default-layout (= 0.1.5)
53+
jekyll-feed (= 0.17.0)
5354
jekyll-gist (= 1.5.0)
54-
jekyll-github-metadata (= 2.13.0)
55+
jekyll-github-metadata (= 2.16.1)
5556
jekyll-include-cache (= 0.2.1)
5657
jekyll-mentions (= 1.6.0)
5758
jekyll-optional-front-matter (= 0.3.2)
@@ -78,28 +79,28 @@ GEM
7879
jekyll-theme-tactile (= 0.2.0)
7980
jekyll-theme-time-machine (= 0.2.0)
8081
jekyll-titles-from-headings (= 0.5.3)
81-
jemoji (= 0.12.0)
82-
kramdown (= 2.3.2)
82+
jemoji (= 0.13.0)
83+
kramdown (= 2.4.0)
8384
kramdown-parser-gfm (= 1.1.0)
8485
liquid (= 4.0.4)
8586
mercenary (~> 0.3)
8687
minima (= 2.5.1)
8788
nokogiri (>= 1.13.6, < 2.0)
88-
rouge (= 3.26.0)
89+
rouge (= 3.30.0)
8990
terminal-table (~> 1.4)
90-
github-pages-health-check (1.17.9)
91+
github-pages-health-check (1.18.2)
9192
addressable (~> 2.3)
9293
dnsruby (~> 1.60)
93-
octokit (~> 4.0)
94-
public_suffix (>= 3.0, < 5.0)
94+
octokit (>= 4, < 8)
95+
public_suffix (>= 3.0, < 6.0)
9596
typhoeus (~> 1.3)
9697
html-pipeline (2.14.3)
9798
activesupport (>= 2)
9899
nokogiri (>= 1.4)
99100
http_parser.rb (0.8.0)
100101
i18n (1.14.5)
101102
concurrent-ruby (~> 1.0)
102-
jekyll (3.9.3)
103+
jekyll (3.9.5)
103104
addressable (~> 2.4)
104105
colorator (~> 1.0)
105106
em-websocket (~> 0.5)
@@ -112,27 +113,27 @@ GEM
112113
pathutil (~> 0.9)
113114
rouge (>= 1.7, < 4)
114115
safe_yaml (~> 1.0)
115-
jekyll-avatar (0.7.0)
116+
jekyll-avatar (0.8.0)
116117
jekyll (>= 3.0, < 5.0)
117-
jekyll-coffeescript (1.1.1)
118+
jekyll-coffeescript (1.2.2)
118119
coffee-script (~> 2.2)
119-
coffee-script-source (~> 1.11.1)
120+
coffee-script-source (~> 1.12)
120121
jekyll-commonmark (1.4.0)
121122
commonmarker (~> 0.22)
122123
jekyll-commonmark-ghpages (0.4.0)
123124
commonmarker (~> 0.23.7)
124125
jekyll (~> 3.9.0)
125126
jekyll-commonmark (~> 1.4.0)
126127
rouge (>= 2.0, < 5.0)
127-
jekyll-default-layout (0.1.4)
128-
jekyll (~> 3.0)
129-
jekyll-feed (0.15.1)
128+
jekyll-default-layout (0.1.5)
129+
jekyll (>= 3.0, < 5.0)
130+
jekyll-feed (0.17.0)
130131
jekyll (>= 3.7, < 5.0)
131132
jekyll-gist (1.5.0)
132133
octokit (~> 4.2)
133-
jekyll-github-metadata (2.13.0)
134+
jekyll-github-metadata (2.16.1)
134135
jekyll (>= 3.4, < 5.0)
135-
octokit (~> 4.0, != 4.4.0)
136+
octokit (>= 4, < 7, != 4.4.0)
136137
jekyll-include-cache (0.2.1)
137138
jekyll (>= 3.7, < 5.0)
138139
jekyll-mentions (1.6.0)
@@ -203,46 +204,47 @@ GEM
203204
jekyll (>= 3.3, < 5.0)
204205
jekyll-watch (2.2.1)
205206
listen (~> 3.0)
206-
jemoji (0.12.0)
207-
gemoji (~> 3.0)
207+
jemoji (0.13.0)
208+
gemoji (>= 3, < 5)
208209
html-pipeline (~> 2.2)
209210
jekyll (>= 3.0, < 5.0)
210-
kramdown (2.3.2)
211+
kramdown (2.4.0)
211212
rexml
212213
kramdown-parser-gfm (1.1.0)
213214
kramdown (~> 2.0)
214215
liquid (4.0.4)
215216
listen (3.9.0)
216217
rb-fsevent (~> 0.10, >= 0.10.3)
217218
rb-inotify (~> 0.9, >= 0.9.10)
219+
logger (1.6.0)
218220
mercenary (0.3.6)
219221
minima (2.5.1)
220222
jekyll (>= 3.5, < 5.0)
221223
jekyll-feed (~> 0.9)
222224
jekyll-seo-tag (~> 2.1)
223-
minitest (5.24.0)
225+
minitest (5.24.1)
224226
mutex_m (0.2.0)
225227
net-http (0.4.1)
226228
uri
227-
nokogiri (1.16.6-arm64-darwin)
229+
nokogiri (1.16.7-arm64-darwin)
228230
racc (~> 1.4)
229-
nokogiri (1.16.6-x86_64-darwin)
231+
nokogiri (1.16.7-x86_64-darwin)
230232
racc (~> 1.4)
231-
nokogiri (1.16.6-x86_64-linux)
233+
nokogiri (1.16.7-x86_64-linux)
232234
racc (~> 1.4)
233235
octokit (4.25.1)
234236
faraday (>= 1, < 3)
235237
sawyer (~> 0.9)
236238
pathutil (0.16.2)
237239
forwardable-extended (~> 2.6)
238-
public_suffix (4.0.7)
239-
racc (1.8.0)
240+
public_suffix (5.1.1)
241+
racc (1.8.1)
240242
rb-fsevent (0.11.2)
241243
rb-inotify (0.11.1)
242244
ffi (~> 1.0)
243-
rexml (3.3.0)
245+
rexml (3.3.4)
244246
strscan
245-
rouge (3.26.0)
247+
rouge (3.30.0)
246248
rubyzip (2.3.2)
247249
safe_yaml (1.0.5)
248250
sass (3.7.4)
@@ -272,8 +274,8 @@ PLATFORMS
272274
x86_64-linux
273275

274276
DEPENDENCIES
275-
github-pages (~> 228)
277+
github-pages (~> 231)
276278
webrick (~> 1.8)
277279

278280
BUNDLED WITH
279-
2.5.11
281+
2.5.16

_data/moderators.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ moderators:
66
As a dedicated developer at QUEO Group, Anke also likes to think outside the box and helps organise local meetups as well as motivating others to get involved in the community.
77
88
We are very happy that Anke will guide us through the event on this special day!
9-
image: '/assets/images/speakers/anke_haeslich.jpg'
9+
image: '/assets/images/speakers/anke-haeslich.jpg'
1010
social:
1111
- icon: 'twitter'
1212
url: 'https://twitter.com/ahaeslich'

_data/schedule.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ schedule:
1515

1616
- name: 'Juliette Reinders Folmer'
1717
time: '09:30'
18-
topic: 'TBA (Keynote)'
18+
topic: 'Resurrecting the dead (Keynote)'
1919
card: '1'
2020
language: 'en'
2121
speaker: true
2222

23-
- name: 'Marco Pivetta (Ocramius)'
23+
- name: 'Sebastian Bergmann'
2424
time: '10:15'
25-
topic: 'TBA'
26-
card: '2'
25+
topic: 'So you think you know PHPUnit'
26+
card: '6'
2727
language: 'en'
2828
speaker: true
2929

3030
- name: 'Sebastian Kurfürst'
3131
time: '11:15'
32-
topic: 'TBA'
32+
topic: 'How to write unmaintainable code'
3333
card: '4'
3434
language: 'en'
3535
speaker: true
@@ -43,15 +43,15 @@ schedule:
4343

4444
- name: 'Sebastian Feldmann'
4545
time: '13:15'
46-
topic: 'TBA'
47-
card: '7'
46+
topic: 'A journey from Monolith to Modulith to Microservices and back'
47+
card: '3'
4848
language: 'en'
4949
speaker: true
5050

51-
- name: 'Stephan Hochdörfer'
51+
- name: 'Ondřej Mirtes'
5252
time: '14:15'
53-
topic: 'TBA'
54-
card: '5'
53+
topic: 'Writing Custom Rules for PHPStan'
54+
card: '2'
5555
language: 'en'
5656
speaker: true
5757

@@ -62,25 +62,25 @@ schedule:
6262
language: ''
6363
speaker: false
6464

65-
- name: 'TBA'
65+
- name: 'Anne-Julia Seitz'
6666
time: '15:30'
67-
topic: 'TBA'
68-
card: '8'
69-
language: ''
67+
topic: 'Running PHP-Applications in a Multi-Process Container'
68+
card: '7'
69+
language: 'en'
7070
speaker: true
7171

72-
- name: 'TBA'
72+
- name: 'Stephan Hochdörfer'
7373
time: '16:30'
74-
topic: 'TBA'
75-
card: '6'
76-
language: ''
74+
topic: 'Need a MACH-ready Search Engine? Choose Gally'
75+
card: '5'
76+
language: 'en'
7777
speaker: true
7878

79-
- name: 'TBA'
79+
- name: 'Carsten Windler'
8080
time: '17:30'
81-
topic: 'TBA'
82-
card: '3'
83-
language: ''
81+
topic: 'How to build sustainable web applications'
82+
card: '8'
83+
language: 'en'
8484
speaker: true
8585

8686
- name: 'Anke Häslich & Holger Woltersdorf'

0 commit comments

Comments
 (0)