Support configurable attachment size via Application Settings

Fix bug where error messages from Dropzone would not be displayed on the issues page

Closes #1258

1 files changed, 7 insertions, 1 deletions

diff --git a/app/services/projects/upload_service.rb b/app/services/projects/upload_service.rb
index a186c97628f..992a7a7a1dc 100644
--- a/app/services/projects/upload_service.rb
+++ b/app/services/projects/upload_service.rb
@@ -5,7 +5,7 @@ module Projects
     end
 
     def execute
-      return nil unless @file
+      return nil unless @file and @file.size <= max_attachment_size
 
       uploader = FileUploader.new(@project)
       uploader.store!(@file)
@@ -18,5 +18,11 @@ module Projects
         'is_image'  => uploader.image?
       }
     end
+
+    private
+
+    def max_attachment_size
+      current_application_settings.max_attachment_size.megabytes.to_i
+    end
   end
 end