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

2019-08-12 16:24:22 +02:00
parent aa485d6f05 74111bbb1c
commit c4ae7aab6f
24 changed files with 214 additions and 120 deletions
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@ -71,7 +71,7 @@ module Admin
      now = Time.now.utc.beginning_of_day.to_date

      (Date.commercial(now.cwyear, now.cweek)..now).map do |date|
-        date.to_time.utc.beginning_of_day.to_i
+        date.to_time(:utc).beginning_of_day.to_i
      end
    end
  end