update to Ruby 4.0.3

yzytom · yzytom · commit e8a8cf169eb3 · 2026-04-22T14:55:56.000+08:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM ruby:3.4.7
-=======
 FROM ruby:4.0.3
->>>>>>> 1ebe37c0 (update to Ruby 4.0.3)
 ENV LANG=C.UTF-8
 ENV ENABLE_SERVICE_WORKER=true
 
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-FROM ruby:3.4.7-alpine
-=======
 FROM ruby:4.0.3-alpine
->>>>>>> 1ebe37c0 (update to Ruby 4.0.3)
-
 ENV LANG=C.UTF-8
 ENV ENABLE_SERVICE_WORKER=true
 
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,5 @@
 source 'https://rubygems.org'
-<<<<<<< HEAD
-ruby '3.4.8'
-=======
 ruby '4.0.3'
->>>>>>> 1ebe37c0 (update to Ruby 4.0.3)
 
 gem 'activesupport', require: false
 gem 'html-pipeline', '~> 2.14'
diff --git a/Gemfile.lock b/Gemfile.lock
