From ffc381ec6f6d05be0d85653bd0e6dfa293199b06 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Sun, 1 Mar 2026 15:40:30 +1030
Subject: [PATCH] Merge pull request #4462 from Growstuff/ruby-3.4

Ruby 3.4.8
---
 .devcontainer/Dockerfile | 2 +-
 .ruby-version            | 2 +-
 Gemfile.lock             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2c7c2fad6..3f5ed44a1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie
 
 # Install Rails
 RUN gem install rails:7.0.8
diff --git a/.ruby-version b/.ruby-version
index 37d02a6e3..7921bd0c8 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.8
+3.4.8
diff --git a/Gemfile.lock b/Gemfile.lock
index 51fa9c270..77b846c14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -900,7 +900,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.3.8p144
+   ruby 3.4.8p72
 
 BUNDLED WITH
    2.4.22