From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 Jul 2019 10:56:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2313'
X-Git-Tag: live~3561
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cea0ba51377a1ac356a58df591092e7b28825f2d?hp=5cb96cd1a2964463dfcb6083da95badecccb7f98

Merge remote-tracking branch 'upstream/pull/2313'
---

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8c234006e..9c918fee7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -665,10 +665,10 @@ class UsersController < ApplicationController
       user.avatar.attach(params[:user][:avatar])
       user.image_use_gravatar = false
     when "delete" then
-      user.avatar.purge
+      user.avatar.purge_later
       user.image_use_gravatar = false
     when "gravatar" then
-      user.avatar.purge
+      user.avatar.purge_later
       user.image_use_gravatar = true
     end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 13248e4fb..8e3ac17ca 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -269,7 +269,7 @@ class User < ActiveRecord::Base
   ##
   # delete a user - leave the account but purge most personal data
   def delete
-    avatar.purge
+    avatar.purge_later
 
     self.display_name = "user_#{id}"
     self.description = ""
diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 3d2c91265..bc9091080 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -1,3 +1,6 @@
+Rails.application.config.active_storage.queue = :storage
+Rails.application.config.active_storage.variable_content_types << "image/bmp"
+
 Rails.configuration.after_initialize do
   require "active_storage/service/s3_service"
   require_dependency "active_storage/variant"
@@ -28,4 +31,6 @@ Rails.configuration.after_initialize do
   ActiveSupport::Reloader.to_complete do
     ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
   end
+
+  ActiveStorage::Service.url_expires_in = 1.week
 end