merge with upstream

Author: graial

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.3

Gemfile.lock

@@ -2,21 +2,22 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
     async (2.3.1)
       console (~> 1.10)
       io-event (~> 1.1)
       timers (~> 4.1)
+    bigdecimal (3.1.8)
     claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
     colorator (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.3.3)
     console (1.16.2)
       fiber-local
     cork (0.3.0)
@@ -50,13 +51,15 @@ GEM
     faraday-http-cache (2.4.1)
       faraday (>= 0.8)
     faraday-net_http (3.0.2)
-    ffi (1.15.5)
+    ffi (1.17.0)
     fiber-local (1.0.0)
     forwardable-extended (2.6.0)
     git (1.13.2)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-protobuf (3.21.12)
+    google-protobuf (4.27.1)
+      bigdecimal
+      rake (>= 13)
     hashery (2.1.2)
     html-proofer (5.0.4)
       addressable (~> 2.3)
@@ -68,10 +71,10 @@ GEM
       yell (~> 2.0)
       zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-event (1.1.6)
-    jekyll (4.3.2)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -96,7 +99,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
@@ -118,23 +121,23 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    public_suffix (5.0.1)
+    public_suffix (5.1.1)
     racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rouge (4.1.0)
+    rexml (3.3.0)
+      strscan
+    rouge (4.3.0)
     ruby-rc4 (0.1.5)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sass-embedded (1.58.0)
-      google-protobuf (~> 3.21)
-      rake (>= 10.0.0)
+    sass-embedded (1.77.5)
+      google-protobuf (>= 3.25, < 5.0)
+      rake (>= 13)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
@@ -145,7 +148,7 @@ GEM
     ttfunk (1.7.0)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     yell (2.2.2)
     zeitwerk (2.6.7)
@@ -161,7 +164,7 @@ DEPENDENCIES
   rake
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.3.3p89
 
 BUNDLED WITH
    2.4.6

_data/conferences.yml

@@ -2438,6 +2438,7 @@
   url: https://helvetic-ruby.ch/2023
   twitter: helvetic_ruby
   mastodon: https://ruby.social/@helvetic_ruby
+  video_link: https://www.youtube.com/playlist?list=PL4jngagx9f7TIyNkSkS15oDrVPCa7LXsT
 
 - name: RubyConf Taiwan 2023
   location: Taipei, Taiwan
@@ -2529,6 +2530,7 @@
   cfp_open_date: 2024-01-24
   cfp_close_date: 2024-02-13
   cfp_link: https://sessionize.com/railsconf2024
+  video_link: https://www.youtube.com/playlist?list=PLbHJudTY1K0chrs_E_XFz2pOJ3d8jCayh
 
 - name: RubyKaigi 2024
   location: Naha, Okinawa, Japan
@@ -2551,6 +2553,7 @@
   cfp_open_date: 2024-01-19
   cfp_close_date: 2024-02-25
   cfp_link: https://helvetic-ruby.ch/call-for-speakers
+  video_link: https://www.youtube.com/playlist?list=PL4jngagx9f7RGaAjXE0PR3z_jsA9cyCji
 
 - name: Blue Ridge Ruby 2024
   location: Asheville, NC, USA
@@ -2634,7 +2637,7 @@
   url: https://rubyconf.africa/
   twitter: ruby_african
   cfp_open_date: 2024-03-20
-  cfp_close_date: 2024-05-31
+  cfp_close_date: 2024-07-20
   cfp_link: https://www.papercall.io/rubyconfafrica2024
 
 - name: Madison+ Ruby 2024
@@ -2673,7 +2676,7 @@
   twitter: friendlyrb
   mastodon: https://ruby.social/@friendlyrb
   cfp_open_date: 2024-03-29
-  cfp_close_date: 2024-08-01
+  cfp_close_date: 2024-07-01
   cfp_link: https://friendlyrb.com/cfp
 
 - name: Rails World 2024
@@ -2696,17 +2699,29 @@
   cfp_close_date: 2024-08-10
   cfp_link: https://www.papercall.io/rubyfuza-2024
 
+- name: Ruby Retreat 2024
+  location: Warrnambool, VIC, Australia
+  url: https://retreat.ruby.org.au/
+  start_date: 2024-10-18
+  end_date: 2024-10-21
+
 - name: Rocky Mountain Ruby 2024
   location: Boulder, Colorado
   start_date: 2024-10-07
-  end_date: 2023-10-08
+  end_date: 2024-10-08
   url: https://rockymtnruby.dev/
   twitter: rmrubyconf
   mastodon: https://ruby.social/@rockymntruby
   cfp_open_date: 2024-05-15
   cfp_close_date: 2024-06-30
   cfp_link: https://sessionize.com/rocky-mountain-ruby
 
+- name: Haggis Ruby 2024
+  location: Edinburgh, Scotland
+  start_date: 2024-10-24
+  end_date: 2024-10-24
+  url: https://haggisruby.co.uk
+
 - name: Kaigi on Rails 2024
   location: Tokyo, Japan
   start_date: 2024-10-25
@@ -2722,6 +2737,26 @@
   url: https://rubyconf.org
   twitter: rubyconf
   mastodon: https://ruby.social/@rubyconf
+  cfp_open_date: 2024-06-06
+  cfp_close_date: 2024-07-22
+  cfp_link: https://sessionize.com/rubyconf-2024/
+
+- name: RubyConf India 2024
+  location: Jaipur, India
+  start_date: 2024-11-29
+  end_date: 2024-11-30
+  url: https://rubyconf.in
+  twitter: rubyconfindia
+  cfp_open_date: 2024-07-23
+  cfp_close_date: 2024-09-25
+  cfp_link: https://www.papercall.io/rubyconf-india-2024
+
+- name: RubyWorld Conference 2024
+  location: Matsue, Japan
+  start_date: 2024-12-05
+  end_date: 2024-12-06
+  url: https://2024.rubyworld-conf.org/en/
+  twitter: rubyworldconf
 
 - name: RubyKaigi 2025
   location: Matsuyama, Ehime, Japan
@@ -2745,3 +2780,31 @@
   url: https://helvetic-ruby.ch
   twitter: helvetic_ruby
   mastodon: https://ruby.social/@helvetic_ruby
+
+- name: Brighton Ruby 2025
+  location: Brighton, UK
+  start_date: 2025-06-19
+  end_date: 2025-06-19
+  url: https://brightonruby.com
+  twitter: brightonruby
+  mastodon: https://ruby.social/@brightonruby
+
+- name: Baltic Ruby 2025
+  location: Riga, Latvia
+  # TODO: update when dates are confirmed
+  start_date: 2025-06-30
+  end_date: 2025-06-30
+  date_precision: month
+  url: https://balticruby.org
+  twitter: balticruby
+  mastodon: https://ruby.social/@balticruby
+
+- name: RailsConf 2025
+  location: United States
+  # TODO: update when dates are confirmed
+  start_date: 2025-12-31
+  end_date: 2025-12-31
+  date_precision: year
+  url: https://www.railsconf.com
+  twitter: railsconf
+  mastodon: https://ruby.social/@railsconf