Merge branch 'account-activation'

Gemfile

@@ -71,4 +71,4 @@ group :production do
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
\ No newline at end of file

Gemfile.lock

@@ -124,6 +124,9 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (1.0.1)
     method_source (1.0.0)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.3)
     minitest (5.14.4)
     minitest-reporters (1.3.8)
@@ -261,6 +264,7 @@ DEPENDENCIES
   guard-minitest (= 2.4.6)
   jbuilder (~> 2.7)
   listen (~> 3.3)
+  mimemagic (~> 0.3.10)
   minitest (= 5.14.4)
   minitest-reporters (= 1.3.8)
   pg (= 1.1.4)