Merge pull request #3344 from hakusaro/change-duration

Skip validation of video duration if user is admin

app/models/upload.rb

@@ -101,11 +101,13 @@ class Upload < ApplicationRecord
     end
 
     def validate_video_duration
+      unless uploader.is_admin?
         if is_video? && video.duration > 120
           raise "video must not be longer than 2 minutes"
         end
       end
     end
+  end
 
   module ConversionMethods
     def process_upload