mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-31 20:54:56 +00:00
b94714baca
Update discourse to latest(ish) ESR version from previous, soon-to-be unsupported, ESR version. Upstream changes: https://releases.discourse.org/changelog/custom?end=v2026.7.0&start=v2026.1.4 Changes: - simple version / dep updates of all plugins and discourse itself - updated the update script to correctly handle changes to discourses's architecture, and fixed a bug - the NamedTemporaryFiles were not flush()ed, which meant their content was not written - discourse now has dependencies under `migrations/` which are specified by path. this requires downloading the `migrations/` directory during the update so `bundle lock` / `bundix` run successfully. the logic for performing this was borrowed from the gitlab package. - the hashes for the newly added dart-sass download are automatically updated - updated some patches to match changes in the targeted code (notification_email, prebuild-asset-processor) - delete a no longer relevant patch (unicorn_logging_and_timeout) (discourse no longer uses unicorn internally, although the external interface is similar / pretends to still exist) - added two new patches, safe-exec-from-nix-store and sass_embedded_vendored_dart_sass - safe-exec-from-nix-store: add /nix/store to the list of executable paths for the container used to sandbox imagemagick, which by default only contains the standard FHS paths - sass_embedded_vendored_dart_sass: patch sass-embedded to use a version of dart-sass provided by the package instead of downloading it's own which would fail. this patch also involves code in default.nix which sets DART_SASS_VENDORED to the path of a downloaded dart-sass version - updated the comment on prebuild-asset-processor.patch to more accurately reflect what and why it exists
20 lines
758 B
Diff
20 lines
758 B
Diff
diff --git a/db/fixtures/990_settings.rb b/db/fixtures/990_settings.rb
|
|
index c64d9fbc205..d8cf8d88010 100644
|
|
--- a/db/fixtures/990_settings.rb
|
|
+++ b/db/fixtures/990_settings.rb
|
|
@@ -1,14 +1,3 @@
|
|
# frozen_string_literal: true
|
|
|
|
-if SiteSetting.notification_email == SiteSetting.defaults[:notification_email]
|
|
- # don't crash for invalid hostname, which is possible in dev
|
|
- begin
|
|
- SiteSetting.notification_email = "noreply@#{Discourse.current_hostname}"
|
|
- rescue Discourse::InvalidParameters
|
|
- if Rails.env.production?
|
|
- STDERR.puts "WARNING: Discourse hostname: #{Discourse.current_hostname} is not a valid domain for emails!"
|
|
- end
|
|
- end
|
|
-end
|
|
-
|
|
SiteSetting.api_key_last_used_epoch = Time.now if SiteSetting.api_key_last_used_epoch.blank?
|