From 1624eb307d4ef80d9078d914ad1aeeb5bcd7f3c2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 16 Apr 2021 12:09:27 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile | 3 --- Gemfile.lock | 6 ------ vendor/shims/mimemagic/Gemfile | 6 ------ vendor/shims/mimemagic/Gemfile.lock | 19 ----------------- vendor/shims/mimemagic/LICENSE.txt | 21 ------------------- vendor/shims/mimemagic/README.md | 1 - vendor/shims/mimemagic/Rakefile | 2 -- vendor/shims/mimemagic/lib/mimemagic.rb | 6 ------ .../shims/mimemagic/lib/mimemagic/version.rb | 3 --- vendor/shims/mimemagic/mimemagic.gemspec | 18 ---------------- 10 files changed, 85 deletions(-) delete mode 100644 vendor/shims/mimemagic/Gemfile delete mode 100644 vendor/shims/mimemagic/Gemfile.lock delete mode 100644 vendor/shims/mimemagic/LICENSE.txt delete mode 100644 vendor/shims/mimemagic/README.md delete mode 100644 vendor/shims/mimemagic/Rakefile delete mode 100644 vendor/shims/mimemagic/lib/mimemagic.rb delete mode 100644 vendor/shims/mimemagic/lib/mimemagic/version.rb delete mode 100644 vendor/shims/mimemagic/mimemagic.gemspec diff --git a/Gemfile b/Gemfile index 7d46e9c123f..ca9a3443639 100644 --- a/Gemfile +++ b/Gemfile @@ -278,9 +278,6 @@ gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content gem 'ruby-magic', '~> 0.4' -# Fake version of the gem to trick bundler -gem 'mimemagic', '0.3.7', path: 'vendor/shims/mimemagic', require: false - # Faster blank gem 'fast_blank' diff --git a/Gemfile.lock b/Gemfile.lock index 3ec19d681ed..4ad1c2420a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,11 +5,6 @@ PATH connection_pool (~> 2.0) mail (~> 2.7) -PATH - remote: vendor/shims/mimemagic - specs: - mimemagic (0.3.7) - GEM remote: https://rubygems.org/ specs: @@ -1497,7 +1492,6 @@ DEPENDENCIES marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) - mimemagic (= 0.3.7)! mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) diff --git a/vendor/shims/mimemagic/Gemfile b/vendor/shims/mimemagic/Gemfile deleted file mode 100644 index ef48903d334..00000000000 --- a/vendor/shims/mimemagic/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source "https://rubygems.org" - -# Specify your gem's dependencies in mimemagic.gemspec -gemspec - -gem "rake", "~> 12.0" diff --git a/vendor/shims/mimemagic/Gemfile.lock b/vendor/shims/mimemagic/Gemfile.lock deleted file mode 100644 index 93ff7db3971..00000000000 --- a/vendor/shims/mimemagic/Gemfile.lock +++ /dev/null @@ -1,19 +0,0 @@ -PATH - remote: . - specs: - mimemagic (0.3.7) - -GEM - remote: https://rubygems.org/ - specs: - rake (12.3.3) - -PLATFORMS - ruby - -DEPENDENCIES - mimemagic! - rake (~> 12.0) - -BUNDLED WITH - 2.1.4 diff --git a/vendor/shims/mimemagic/LICENSE.txt b/vendor/shims/mimemagic/LICENSE.txt deleted file mode 100644 index 568df6132bc..00000000000 --- a/vendor/shims/mimemagic/LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 57ef8dc41e1..00000000000 --- a/vendor/shims/mimemagic/README.md +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 43022f711e2..00000000000 --- a/vendor/shims/mimemagic/Rakefile +++ /dev/null @@ -1,2 +0,0 @@ -require "bundler/gem_tasks" -task :default => :spec diff --git a/vendor/shims/mimemagic/lib/mimemagic.rb b/vendor/shims/mimemagic/lib/mimemagic.rb deleted file mode 100644 index 1deab5d90a7..00000000000 --- a/vendor/shims/mimemagic/lib/mimemagic.rb +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index eab707147e7..00000000000 --- a/vendor/shims/mimemagic/lib/mimemagic/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module MimeMagic - VERSION = "0.3.7" -end diff --git a/vendor/shims/mimemagic/mimemagic.gemspec b/vendor/shims/mimemagic/mimemagic.gemspec deleted file mode 100644 index 86f7f824923..00000000000 --- a/vendor/shims/mimemagic/mimemagic.gemspec +++ /dev/null @@ -1,18 +0,0 @@ -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