From f051c2e8131616018486cfb9f4a80a120ca71f6e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 19 Jan 2017 09:37:07 +0100
Subject: [PATCH] Fix statsd null backend not being initialized properly

---
 Gemfile                           | 2 +-
 Gemfile.lock                      | 7 +++----
 app/models/account.rb             | 3 ++-
 config/environments/production.rb | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1341e45de8..aa149c61e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'dotenv-rails'
 gem 'font-awesome-rails'
 gem 'best_in_place', '~> 3.0.1'
 
-gem 'paperclip', '~> 5.0'
+gem 'paperclip', '~> 5.1'
 gem 'paperclip-av-transcoder'
 gem 'aws-sdk', '>= 2.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7214d21eb6..9b33580fcb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,8 +76,7 @@ GEM
     bullet (5.3.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.1)
@@ -89,7 +88,7 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorize (0.8.1)
-    concurrent-ruby (1.0.3)
+    concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -437,7 +436,7 @@ DEPENDENCIES
   nokogiri
   oj
   ostatus2
-  paperclip (~> 5.0)
+  paperclip (~> 5.1)
   paperclip-av-transcoder
   pg
   pg_search
diff --git a/app/models/account.rb b/app/models/account.rb
index 621a66e24b..c2a41c4c63 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -126,7 +126,8 @@ class Account < ApplicationRecord
   def save_with_optional_avatar!
     save!
   rescue ActiveRecord::RecordInvalid
-    self.avatar = nil
+    self.avatar              = nil
+    self[:avatar_remote_url] = ''
     save!
   end
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 30170e8105..1572eaf6cf 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -106,6 +106,6 @@ Rails.application.configure do
   config.active_record.logger = nil
 
   config.to_prepare do
-    StatsD.backend = StatsD::Instrument::Backends::NullBackend if ENV['STATSD_ADDR'].blank?
+    StatsD.backend = StatsD::Instrument::Backends::NullBackend.new if ENV['STATSD_ADDR'].blank?
   end
 end