From 9f84454a8d08bddd9937c3006ac668311f3b9a07 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Wed, 14 Nov 2018 12:29:07 -0800
Subject: [PATCH] Uploader changes based on
 https://github.com/carrierwaveuploader/carrierwave

---
 .rubocop_todo.yml                 | 1 +
 app/uploaders/picture_uploader.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index dd702c07..f37b3180 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1313,6 +1313,7 @@ Style/RegexpLiteral:
   Exclude:
     - 'Guardfile'
     - 'config/initializers/airbrake.rb'
+    - 'app/uploaders/picture_uploader.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
diff --git a/app/uploaders/picture_uploader.rb b/app/uploaders/picture_uploader.rb
index 1b6385dd..4cad1594 100644
--- a/app/uploaders/picture_uploader.rb
+++ b/app/uploaders/picture_uploader.rb
@@ -84,12 +84,12 @@ class PictureUploader < CarrierWave::Uploader::Base
 
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
-  def extension_white_list
+  def extension_whitelist
     %w(jpg jpeg gif png)
   end
 
   def content_type_whitelist
-    %r{/image\//}
+    /image\//
   end
 
   private