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

9 files changed, 57 insertions, 0 deletions

diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
index 259148fa18f..259148fa18f 100644..100755
--- a/vendor/gitignore/C++.gitignore
+++ b/vendor/gitignore/C++.gitignore
diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore
index a1c2a238a96..a1c2a238a96 100644..100755
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore
diff --git a/vendor/shims/mimemagic/Gemfile b/vendor/shims/mimemagic/Gemfile
new file mode 100644
index 00000000000..ef48903d334
--- /dev/null
+++ b/vendor/shims/mimemagic/Gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in mimemagic.gemspec
+gemspec
+
+gem "rake", "~> 12.0"
diff --git a/vendor/shims/mimemagic/LICENSE.txt b/vendor/shims/mimemagic/LICENSE.txt
new file mode 100644
index 00000000000..568df6132bc
--- /dev/null
+++ b/vendor/shims/mimemagic/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 GitLab B.V.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/shims/mimemagic/README.md b/vendor/shims/mimemagic/README.md
new file mode 100644
index 00000000000..57ef8dc41e1
--- /dev/null
+++ b/vendor/shims/mimemagic/README.md
@@ -0,0 +1 @@
+This is a fake gem to prevent mimemagic from being included into GitLab.
diff --git a/vendor/shims/mimemagic/Rakefile b/vendor/shims/mimemagic/Rakefile
new file mode 100644
index 00000000000..43022f711e2
--- /dev/null
+++ b/vendor/shims/mimemagic/Rakefile
@@ -0,0 +1,2 @@
+require "bundler/gem_tasks"
+task :default => :spec
diff --git a/vendor/shims/mimemagic/lib/mimemagic.rb b/vendor/shims/mimemagic/lib/mimemagic.rb
new file mode 100644
index 00000000000..1deab5d90a7
--- /dev/null
+++ b/vendor/shims/mimemagic/lib/mimemagic.rb
@@ -0,0 +1,6 @@
+require "mimemagic/version"
+
+module MimeMagic
+  class Error < StandardError; end
+  raise Error, 'This gem should never be required'
+end
diff --git a/vendor/shims/mimemagic/lib/mimemagic/version.rb b/vendor/shims/mimemagic/lib/mimemagic/version.rb
new file mode 100644
index 00000000000..eab707147e7
--- /dev/null
+++ b/vendor/shims/mimemagic/lib/mimemagic/version.rb
@@ -0,0 +1,3 @@
+module MimeMagic
+  VERSION = "0.3.7"
+end
diff --git a/vendor/shims/mimemagic/mimemagic.gemspec b/vendor/shims/mimemagic/mimemagic.gemspec
new file mode 100644
index 00000000000..86f7f824923
--- /dev/null
+++ b/vendor/shims/mimemagic/mimemagic.gemspec
@@ -0,0 +1,18 @@
+require_relative 'lib/mimemagic/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "mimemagic"
+  spec.version       = MimeMagic::VERSION
+  spec.authors       = ["Marc Shaw"]
+  spec.email         = ["mshaw@gitlab.com"]
+
+  spec.summary       = %q{MimeMagic shim}
+  spec.description   = %q{A shim for mimemagic}
+  spec.homepage      = "https://gitlab.com/gitlab-org/gitlab/-/tree/master/vendor/shims/mimemagic"
+  spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+
+  spec.files = %w[lib/mimemagic.rb lib/mimemagic/version.rb]
+
+  spec.require_paths = ["lib"]
+end