Skip to content

Commit d5b4e53

Browse files
author
graial
committed
merge with upstream
2 parents e0507ad + 84d485e commit d5b4e53

5 files changed

Lines changed: 543 additions & 50 deletions

File tree

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.3.3

Gemfile.lock

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
Ascii85 (1.1.0)
5-
addressable (2.8.1)
5+
addressable (2.8.6)
66
public_suffix (>= 2.0.2, < 6.0)
77
afm (0.2.2)
88
async (2.3.1)
99
console (~> 1.10)
1010
io-event (~> 1.1)
1111
timers (~> 4.1)
12+
bigdecimal (3.1.8)
1213
claide (1.1.0)
1314
claide-plugins (0.9.2)
1415
cork
1516
nap
1617
open4 (~> 1.3)
1718
colorator (1.1.0)
1819
colored2 (3.1.2)
19-
concurrent-ruby (1.2.0)
20+
concurrent-ruby (1.3.3)
2021
console (1.16.2)
2122
fiber-local
2223
cork (0.3.0)
@@ -50,13 +51,15 @@ GEM
5051
faraday-http-cache (2.4.1)
5152
faraday (>= 0.8)
5253
faraday-net_http (3.0.2)
53-
ffi (1.15.5)
54+
ffi (1.17.0)
5455
fiber-local (1.0.0)
5556
forwardable-extended (2.6.0)
5657
git (1.13.2)
5758
addressable (~> 2.8)
5859
rchardet (~> 1.8)
59-
google-protobuf (3.21.12)
60+
google-protobuf (4.27.1)
61+
bigdecimal
62+
rake (>= 13)
6063
hashery (2.1.2)
6164
html-proofer (5.0.4)
6265
addressable (~> 2.3)
@@ -68,10 +71,10 @@ GEM
6871
yell (~> 2.0)
6972
zeitwerk (~> 2.5)
7073
http_parser.rb (0.8.0)
71-
i18n (1.12.0)
74+
i18n (1.14.5)
7275
concurrent-ruby (~> 1.0)
7376
io-event (1.1.6)
74-
jekyll (4.3.2)
77+
jekyll (4.3.3)
7578
addressable (~> 2.4)
7679
colorator (~> 1.0)
7780
em-websocket (~> 0.5)
@@ -96,7 +99,7 @@ GEM
9699
kramdown-parser-gfm (1.1.0)
97100
kramdown (~> 2.0)
98101
liquid (4.0.4)
99-
listen (3.8.0)
102+
listen (3.9.0)
100103
rb-fsevent (~> 0.10, >= 0.10.3)
101104
rb-inotify (~> 0.9, >= 0.9.10)
102105
mercenary (0.4.0)
@@ -118,23 +121,23 @@ GEM
118121
hashery (~> 2.0)
119122
ruby-rc4
120123
ttfunk
121-
public_suffix (5.0.1)
124+
public_suffix (5.1.1)
122125
racc (1.7.3)
123126
rainbow (3.1.1)
124-
rake (13.0.6)
127+
rake (13.2.1)
125128
rb-fsevent (0.11.2)
126-
rb-inotify (0.10.1)
129+
rb-inotify (0.11.1)
127130
ffi (~> 1.0)
128131
rchardet (1.8.0)
129-
rexml (3.2.8)
130-
strscan (>= 3.0.9)
131-
rouge (4.1.0)
132+
rexml (3.3.0)
133+
strscan
134+
rouge (4.3.0)
132135
ruby-rc4 (0.1.5)
133136
ruby2_keywords (0.0.5)
134137
safe_yaml (1.0.5)
135-
sass-embedded (1.58.0)
136-
google-protobuf (~> 3.21)
137-
rake (>= 10.0.0)
138+
sass-embedded (1.77.5)
139+
google-protobuf (>= 3.25, < 5.0)
140+
rake (>= 13)
138141
sawyer (0.9.2)
139142
addressable (>= 2.3.5)
140143
faraday (>= 0.17.3, < 3)
@@ -145,7 +148,7 @@ GEM
145148
ttfunk (1.7.0)
146149
typhoeus (1.4.0)
147150
ethon (>= 0.9.0)
148-
unicode-display_width (2.4.2)
151+
unicode-display_width (2.5.0)
149152
webrick (1.8.1)
150153
yell (2.2.2)
151154
zeitwerk (2.6.7)
@@ -161,7 +164,7 @@ DEPENDENCIES
161164
rake
162165

163166
RUBY VERSION
164-
ruby 3.2.2p53
167+
ruby 3.3.3p89
165168

166169
BUNDLED WITH
167170
2.4.6

_data/conferences.yml

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,6 +2438,7 @@
24382438
url: https://helvetic-ruby.ch/2023
24392439
twitter: helvetic_ruby
24402440
mastodon: https://ruby.social/@helvetic_ruby
2441+
video_link: https://www.youtube.com/playlist?list=PL4jngagx9f7TIyNkSkS15oDrVPCa7LXsT
24412442

24422443
- name: RubyConf Taiwan 2023
24432444
location: Taipei, Taiwan
@@ -2529,6 +2530,7 @@
25292530
cfp_open_date: 2024-01-24
25302531
cfp_close_date: 2024-02-13
25312532
cfp_link: https://sessionize.com/railsconf2024
2533+
video_link: https://www.youtube.com/playlist?list=PLbHJudTY1K0chrs_E_XFz2pOJ3d8jCayh
25322534

25332535
- name: RubyKaigi 2024
25342536
location: Naha, Okinawa, Japan
@@ -2551,6 +2553,7 @@
25512553
cfp_open_date: 2024-01-19
25522554
cfp_close_date: 2024-02-25
25532555
cfp_link: https://helvetic-ruby.ch/call-for-speakers
2556+
video_link: https://www.youtube.com/playlist?list=PL4jngagx9f7RGaAjXE0PR3z_jsA9cyCji
25542557

25552558
- name: Blue Ridge Ruby 2024
25562559
location: Asheville, NC, USA
@@ -2634,7 +2637,7 @@
26342637
url: https://rubyconf.africa/
26352638
twitter: ruby_african
26362639
cfp_open_date: 2024-03-20
2637-
cfp_close_date: 2024-05-31
2640+
cfp_close_date: 2024-07-20
26382641
cfp_link: https://www.papercall.io/rubyconfafrica2024
26392642

26402643
- name: Madison+ Ruby 2024
@@ -2673,7 +2676,7 @@
26732676
twitter: friendlyrb
26742677
mastodon: https://ruby.social/@friendlyrb
26752678
cfp_open_date: 2024-03-29
2676-
cfp_close_date: 2024-08-01
2679+
cfp_close_date: 2024-07-01
26772680
cfp_link: https://friendlyrb.com/cfp
26782681

26792682
- name: Rails World 2024
@@ -2696,17 +2699,29 @@
26962699
cfp_close_date: 2024-08-10
26972700
cfp_link: https://www.papercall.io/rubyfuza-2024
26982701

2702+
- name: Ruby Retreat 2024
2703+
location: Warrnambool, VIC, Australia
2704+
url: https://retreat.ruby.org.au/
2705+
start_date: 2024-10-18
2706+
end_date: 2024-10-21
2707+
26992708
- name: Rocky Mountain Ruby 2024
27002709
location: Boulder, Colorado
27012710
start_date: 2024-10-07
2702-
end_date: 2023-10-08
2711+
end_date: 2024-10-08
27032712
url: https://rockymtnruby.dev/
27042713
twitter: rmrubyconf
27052714
mastodon: https://ruby.social/@rockymntruby
27062715
cfp_open_date: 2024-05-15
27072716
cfp_close_date: 2024-06-30
27082717
cfp_link: https://sessionize.com/rocky-mountain-ruby
27092718

2719+
- name: Haggis Ruby 2024
2720+
location: Edinburgh, Scotland
2721+
start_date: 2024-10-24
2722+
end_date: 2024-10-24
2723+
url: https://haggisruby.co.uk
2724+
27102725
- name: Kaigi on Rails 2024
27112726
location: Tokyo, Japan
27122727
start_date: 2024-10-25
@@ -2722,6 +2737,26 @@
27222737
url: https://rubyconf.org
27232738
twitter: rubyconf
27242739
mastodon: https://ruby.social/@rubyconf
2740+
cfp_open_date: 2024-06-06
2741+
cfp_close_date: 2024-07-22
2742+
cfp_link: https://sessionize.com/rubyconf-2024/
2743+
2744+
- name: RubyConf India 2024
2745+
location: Jaipur, India
2746+
start_date: 2024-11-29
2747+
end_date: 2024-11-30
2748+
url: https://rubyconf.in
2749+
twitter: rubyconfindia
2750+
cfp_open_date: 2024-07-23
2751+
cfp_close_date: 2024-09-25
2752+
cfp_link: https://www.papercall.io/rubyconf-india-2024
2753+
2754+
- name: RubyWorld Conference 2024
2755+
location: Matsue, Japan
2756+
start_date: 2024-12-05
2757+
end_date: 2024-12-06
2758+
url: https://2024.rubyworld-conf.org/en/
2759+
twitter: rubyworldconf
27252760

27262761
- name: RubyKaigi 2025
27272762
location: Matsuyama, Ehime, Japan
@@ -2745,3 +2780,31 @@
27452780
url: https://helvetic-ruby.ch
27462781
twitter: helvetic_ruby
27472782
mastodon: https://ruby.social/@helvetic_ruby
2783+
2784+
- name: Brighton Ruby 2025
2785+
location: Brighton, UK
2786+
start_date: 2025-06-19
2787+
end_date: 2025-06-19
2788+
url: https://brightonruby.com
2789+
twitter: brightonruby
2790+
mastodon: https://ruby.social/@brightonruby
2791+
2792+
- name: Baltic Ruby 2025
2793+
location: Riga, Latvia
2794+
# TODO: update when dates are confirmed
2795+
start_date: 2025-06-30
2796+
end_date: 2025-06-30
2797+
date_precision: month
2798+
url: https://balticruby.org
2799+
twitter: balticruby
2800+
mastodon: https://ruby.social/@balticruby
2801+
2802+
- name: RailsConf 2025
2803+
location: United States
2804+
# TODO: update when dates are confirmed
2805+
start_date: 2025-12-31
2806+
end_date: 2025-12-31
2807+
date_precision: year
2808+
url: https://www.railsconf.com
2809+
twitter: railsconf
2810+
mastodon: https://ruby.social/@railsconf

0 commit comments

Comments
 (0)