From 2b0086ac3273ca964dea1dde3e2b1f4a5feeb827 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 10:09:51 +0000 Subject: [PATCH 1/3] Bump nokogiri from 1.18.3 to 1.18.4 (#3012) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.3 to 1.18.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.18.3...v1.18.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3d1a3f0d3..0af8cb328 100644 --- a/Gemfile.lock +++ b/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) From d70a5d88d835412bfd1efbb501ec39440cbf848c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:01:48 +0000 Subject: [PATCH 2/3] Bump nokogiri from 1.18.3 to 1.18.4 in /docs (#3014) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.3 to 1.18.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.18.3...v1.18.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 8abf94d7a..1183691f9 100644 --- a/docs/Gemfile.lock +++ b/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) From 853dcde1e34115d4630819b4d312294f3e9f6b6e Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:12:14 +0000 Subject: [PATCH 3/3] Update the deadlines (#3009) --- app/models/form.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/models/form.rb b/app/models/form.rb index a6558efab..38f6c86d2 100644 --- a/app/models/form.rb +++ b/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) },