Merge branch 'main' into CLDC-3860-Bulk-upload-prevent-reasonpref-dontknow-being-selected

Dockerfile

@@ -13,7 +13,7 @@ RUN apk add --update --no-cache tzdata && \
 RUN apk add --no-cache build-base=0.5-r3 busybox=1.36.1-r7 nodejs-current=20.8.1-r0 yarn=1.22.19-r0 postgresql13-dev=13.18-r0 bash=5.2.15-r5
 
 # Bundler version should be the same version as what the Gemfile.lock was bundled with
-RUN gem install bundler:2.3.14 --no-document
+RUN gem install bundler:2.6.4 --no-document
 
 COPY .ruby-version Gemfile Gemfile.lock /app/
 RUN bundle config set without "development test"

Gemfile.lock

@@ -288,11 +288,13 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.17.1-arm64-darwin)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.17.1-x86_64-darwin)
+    nokogiri (1.18.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.17.1-x86_64-linux)
+    nokogiri (1.18.3-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.3-x86_64-linux-musl)
       racc (~> 1.4)
     notifications-ruby-client (6.0.0)
       jwt (>= 1.5, < 3)
@@ -534,14 +536,10 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
-  arm64-darwin-21
+  arm64-darwin
-  arm64-darwin-22
+  x86_64-darwin
-  arm64-darwin-23
+  x86_64-linux-gnu
-  x86_64-darwin-19
+  x86_64-linux-musl
-  x86_64-darwin-20
-  x86_64-darwin-21
-  x86_64-darwin-22
-  x86_64-linux
 
 DEPENDENCIES
   auto_strip_attributes
@@ -611,4 +609,4 @@ RUBY VERSION
    ruby 3.1.4p223
 
 BUNDLED WITH
-   2.3.14
+   2.6.4

config/locales/forms/2025/sales/setup.en.yml

@@ -42,8 +42,8 @@ en:
             page_header: ""
             check_answer_label: "Purchase made under ownership scheme"
             check_answer_prompt: "Tell us if purchase made under ownership scheme"
-            hint_text: ""
+            hint_text: "Sales logs are not required for outright and other sales."
-            question_text: "Was this purchase made through an ownership scheme?"
+            question_text: "Select the type of sale"
 
           staircasing:
             page_header: ""

docs/Gemfile.lock

@@ -210,11 +210,11 @@ GEM
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.19.0)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.18.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -222,7 +222,7 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.7.3)
+    racc (1.8.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -264,4 +264,4 @@ DEPENDENCIES
   webrick
 
 BUNDLED WITH
-   2.3.14
+   2.6.4