Add latest changes from gitlab-org/gitlab@13-10-stable-ee

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/gitlab/utils/mime_type.rb b/lib/gitlab/utils/mime_type.rb
new file mode 100644
index 00000000000..d82092a2d2c
--- /dev/null
+++ b/lib/gitlab/utils/mime_type.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+require 'magic'
+
+# This wraps calls to a gem which support mime type detection.
+# We use the `ruby-magic` gem instead of `mimemagic` due to licensing issues
+module Gitlab
+  module Utils
+    class MimeType
+      class << self
+        def from_io(io)
+          return unless io.is_a?(IO) || io.is_a?(StringIO)
+
+          mime_type = File.magic(io, Magic::MIME_TYPE)
+          mime_type == 'inode/x-empty' ? nil : mime_type
+        end
+
+        def from_string(string)
+          return unless string.is_a?(String)
+
+          string.type
+        end
+      end
+    end
+  end
+end