Merge branch 'main' into glitch-soc/merge-upstream

2023-03-02 17:32:38 +01:00
parent 6a4be4e966 af578e8ce0
commit 276c1d32d6
97 changed files with 1412 additions and 523 deletions
--- a/app/helpers/admin/announcements_helper.rb
+++ b/app/helpers/admin/announcements_helper.rb
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Admin::AnnouncementsHelper
-  def time_range(announcement)
-    if announcement.all_day?
-      safe_join([l(announcement.starts_at.to_date), ' - ', l(announcement.ends_at.to_date)])
-    else
-      safe_join([l(announcement.starts_at), ' - ', l(announcement.ends_at)])
-    end
-  end
-end