Merge remote-tracking branch 'parent/main' into upstream-20240618

2024-06-18 07:43:33 +09:00 · 2024-06-18 07:43:33 +09:00 · aa2cdc898a
commit aa2cdc898a
parent 3d0f5697a1 d5f02adad7
271 changed files with 1839 additions and 1397 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -270,6 +270,10 @@ module ApplicationHelper
    instance_presenter.app_icon&.file&.url(size)
  end

+  def use_mask_icon?
+    instance_presenter.app_icon.blank?
+  end
+
  private

  def storage_host_var