9 files changed, 57 insertions, 17 deletions
diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index de8bfc5aa..743fdfa63 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -1,4 +1,26 @@
 # frozen_string_literal: true
 
-require 'models/acts_as_taggable_on-tag'
+module ActsAsTaggableOn
+  class Tag
+    self.include_root_in_json = false
+
+    def self.tag_text_regexp
+      @tag_text_regexp ||= "[[:word:]]\u055b\u055c\u055e\u058a_-"
+    end
+
+    def self.autocomplete(name)
+      where("name LIKE ?", "#{name.downcase}%").order("name ASC")
+    end
+
+    def self.normalize(name)
+      if name =~ /^#?<3/
+        # Special case for love, because the world needs more love.
+        "<3"
+      elsif name
+        name.gsub(/[^#{tag_text_regexp}]/, "").downcase
+      end
+    end
+  end
+end
+
 ActsAsTaggableOn.force_lowercase = true
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
index 315ac48a9..f4556db39 100644
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
-# ApplicationController.renderer.defaults.merge!(
-#   http_host: 'example.org',
-#   https: false
-# )
+# ActiveSupport::Reloader.to_prepare do
+#   ApplicationController.renderer.defaults.merge!(
+#     http_host: 'example.org',
+#     https: false
+#   )
+# end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 0874787e3..5cae6d59f 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -25,4 +25,15 @@ Rails.application.config.assets.version = "1.0"
 # Add Yarn node_modules folder to the asset load path.
 # Rails.application.config.assets.paths << Rails.root.join("node_modules")
 
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )
+
 Rails.application.config.public_file_server.enabled = AppConfig.environment.assets.serve?
+
+# assets:precompile can sometimes fail with a Segmentation fault.
+# Disabling export_concurrent is a workaround. See: https://github.com/sass/sassc-ruby/issues/207
+Rails.application.config.assets.configure do |env|
+  env.export_concurrent = false
+end
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index d0f0d3b5d..9290b5041 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -2,7 +2,8 @@
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
 
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
diff --git a/config/initializers/color_themes.rb b/config/initializers/color_themes.rb
index 7cabdba64..8231c73ac 100644
--- a/config/initializers/color_themes.rb
+++ b/config/initializers/color_themes.rb
@@ -17,3 +17,10 @@ if color_themes_file.exist?
 else
   AVAILABLE_COLOR_THEMES = ["original"].freeze
 end
+
+unless Rails.env.test?
+  AVAILABLE_COLOR_THEMES.each do |theme_code|
+    Rails.application.config.assets.precompile +=
+      %W[color_themes/#{theme_code}/desktop.css color_themes/#{theme_code}/mobile.css]
+  end
+end
diff --git a/config/initializers/entypo.rb b/config/initializers/entypo.rb
deleted file mode 100644
index 1a0fa5221..000000000
--- a/config/initializers/entypo.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-Entypo.css_prefix = "entypo"
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 791647716..94e395494 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -3,5 +3,6 @@
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += %i[password message text bio]
-Rails.application.config.filter_parameters += [:otp_attempt]
+Rails.application.config.filter_parameters += %i[
+  password passw secret token _key crypt salt certificate otp otp_attempt ssn message text bio
+]
diff --git a/config/initializers/markerb.rb b/config/initializers/markerb.rb
deleted file mode 100644
index a39d0cbee..000000000
--- a/config/initializers/markerb.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-Rails.application.config.markerb.renderer = Diaspora::Markdownify::Email
diff --git a/config/initializers/sidekiq_scheduled.rb b/config/initializers/sidekiq_scheduled.rb
index 46fc92adb..7385651ee 100644
--- a/config/initializers/sidekiq_scheduled.rb
+++ b/config/initializers/sidekiq_scheduled.rb
@@ -79,5 +79,7 @@ if Sidekiq.server?
   schedule_file_path = Rails.root.join("config", "schedule.yml")
   regenerate_config(schedule_file_path) unless valid_config?(schedule_file_path)
 
-  Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file_path)
+  Rails.application.reloader.to_prepare do
+    Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file_path)
+  end
 end