Merge branch 'jej/upload-file-tracks-lfs' into 'master'

File upload UI obeys LFS filter

Closes #29876

See merge request gitlab-org/gitlab-ce!16412

2 files changed, 30 insertions, 0 deletions

diff --git a/lib/carrier_wave_string_file.rb b/lib/carrier_wave_string_file.rb
new file mode 100644
index 00000000000..6c848902e4a
--- /dev/null
+++ b/lib/carrier_wave_string_file.rb
@@ -0,0 +1,5 @@
+class CarrierWaveStringFile < StringIO
+  def original_filename
+    ""
+  end
+end
diff --git a/lib/gitlab/git/lfs_pointer_file.rb b/lib/gitlab/git/lfs_pointer_file.rb
new file mode 100644
index 00000000000..da12ed7d125
--- /dev/null
+++ b/lib/gitlab/git/lfs_pointer_file.rb
@@ -0,0 +1,25 @@
+module Gitlab
+  module Git
+    class LfsPointerFile
+      def initialize(data)
+        @data = data
+      end
+
+      def pointer
+        @pointer ||= <<~FILE
+          version https://git-lfs.github.com/spec/v1
+          oid sha256:#{sha256}
+          size #{size}
+        FILE
+      end
+
+      def size
+        @size ||= @data.bytesize
+      end
+
+      def sha256
+        @sha256 ||= Digest::SHA256.hexdigest(@data)
+      end
+    end
+  end
+end