From 2aaa1b62fdf0e2dec4637f7e9d5d46ec46f7fa77 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@gmail.com>
Date: Thu, 2 Nov 2023 19:47:33 +0800
Subject: [PATCH 1/2] Update README.md

test
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8f6bafc6f261e..fa5775e969e7b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+x
+
 <a href="https://www.discourse.org/">
   <img src="images/discourse-readme-logo.png" width="300px">
 </a>

From cff618cf77cf44f403affe5a17655d4a4155d8f6 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sun, 26 Oct 2025 11:01:49 +0000
Subject: [PATCH 2/2] fix: Gemfile & Gemfile.lock to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-NETIMAP-10006666
- https://snyk.io/vuln/SNYK-RUBY-NETIMAP-8708041
---
 Gemfile      |  2 +-
 Gemfile.lock | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 649c1df5815ac..e919501dc515f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem "actionview_precompiler", require: false
 
 gem "discourse-seed-fu"
 
-gem "mail"
+gem "mail", ">= 2.9.0"
 gem "mini_mime"
 gem "mini_suffix"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3925d1e379e6c..c5d7f6a94511b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -130,7 +130,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    date (3.3.3)
+    date (3.4.1)
     debug_inspector (1.1.0)
     diff-lcs (1.5.0)
     diffy (3.4.2)
@@ -209,6 +209,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     literate_randomizer (0.4.0)
+    logger (1.7.0)
     lograge (0.13.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -223,7 +224,8 @@ GEM
       nokogiri (>= 1.12.0)
     lru_redux (1.1.0)
     lz4-ruby (0.3.3)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -253,14 +255,14 @@ GEM
     mustache (1.1.1)
     net-http (0.3.2)
       uri
-    net-imap (0.3.7)
+    net-imap (0.5.12)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.15.4)
@@ -497,7 +499,7 @@ GEM
     test-prof (1.2.2)
     thor (1.2.2)
     tilt (2.2.0)
-    timeout (0.4.0)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2023.3)
@@ -597,7 +599,7 @@ DEPENDENCIES
   loofah
   lru_redux
   lz4-ruby
-  mail
+  mail (>= 2.9.0)
   maxminddb
   memory_profiler
   message_bus
@@ -677,4 +679,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.13
+   2.3.27