Merge remote-tracking branch 'origin/main-jh' into pre-main-jh

jh/Gemfile.checksum.jh

 [
 {"name":"chinese_pinyin","version":"1.1.0","platform":"ruby","checksum":"129d5673891c5e6f1647fe6367eb1a9e7f11969d5eab3584615514e23b286437"},
+{"name":"gettext_i18n_rails_js","version":"2.0.0","platform":"ruby","checksum":"7bfb72699e3cdf9a2d892cc816e70442a08d0f4e340b92731249ad38b9205b51"},
+{"name":"po_to_json","version":"2.0.0","platform":"ruby","checksum":"9e59b2904c015d2fcad3ec02022970ad0fb6622f6eb5ba82b47dff99d2fd6b2a"},
 {"name":"posthog-ruby","version":"1.3.0","platform":"ruby","checksum":"2e7656dcab67e45848786fe660ffd810a1b4a9339ca72800a668c720bde5b5cb"}
 ]

jh/spec/mailers/notify_spec.rb

@@ -129,7 +129,7 @@
       is_expected.to have_body_text "If you have no plan to continue using #{Gitlab.config.gitlab.host}, " \
                                     "please <a href=\"https://docs.gitlab.cn/jh/user/group/import/index.html\" " \
                                     "target=\"_blank\" rel=\"noopener noreferrer\">migrate your data</a> " \
-                                    "before 2023-12-12. " \
+                                    "before #{trial_end_date}. " \
                                     "After free trial ends, your data will be deleted."
     end
   end