Merge branch 'main' into CLDC-3940-Disable-allow-future-form-use

Gemfile.lock

@@ -289,13 +289,13 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.3-arm64-darwin)
+    nokogiri (1.18.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-darwin)
+    nokogiri (1.18.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-gnu)
+    nokogiri (1.18.4-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-musl)
+    nokogiri (1.18.4-x86_64-linux-musl)
       racc (~> 1.4)
     notifications-ruby-client (6.0.0)
       jwt (>= 1.5, < 3)

app/models/form.rb

@@ -16,6 +16,13 @@ class Form
     },
     2024 => {
       submission_deadline: Time.zone.local(2025, 6, 6),
+      new_logs_end_date: Time.zone.local(2025, 7, 4),
+      edit_end_date: Time.zone.local(2025, 8, 1),
+    },
+    2025 => {
+      submission_deadline: Time.zone.local(2026, 6, 5),
+      new_logs_end_date: Time.zone.local(2026, 7, 3),
+      edit_end_date: Time.zone.local(2026, 8, 1),
     },
     :default => {
       submission_deadline: ->(start_year) { Time.zone.local(start_year + 1, 6, 1) },

docs/Gemfile.lock

@@ -210,11 +210,11 @@ GEM
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.19.0)
-    nokogiri (1.18.3-arm64-darwin)
+    nokogiri (1.18.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-darwin)
+    nokogiri (1.18.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-gnu)
+    nokogiri (1.18.4-x86_64-linux-gnu)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)