Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
f079dd371c
commit
1624eb307d
3
Gemfile
3
Gemfile
|
@ -278,9 +278,6 @@ gem 'charlock_holmes', '~> 0.7.7'
|
||||||
# Detect mime content type from content
|
# Detect mime content type from content
|
||||||
gem 'ruby-magic', '~> 0.4'
|
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
|
# Faster blank
|
||||||
gem 'fast_blank'
|
gem 'fast_blank'
|
||||||
|
|
||||||
|
|
|
@ -5,11 +5,6 @@ PATH
|
||||||
connection_pool (~> 2.0)
|
connection_pool (~> 2.0)
|
||||||
mail (~> 2.7)
|
mail (~> 2.7)
|
||||||
|
|
||||||
PATH
|
|
||||||
remote: vendor/shims/mimemagic
|
|
||||||
specs:
|
|
||||||
mimemagic (0.3.7)
|
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
@ -1497,7 +1492,6 @@ DEPENDENCIES
|
||||||
marginalia (~> 1.10.0)
|
marginalia (~> 1.10.0)
|
||||||
memory_profiler (~> 0.9)
|
memory_profiler (~> 0.9)
|
||||||
method_source (~> 1.0)
|
method_source (~> 1.0)
|
||||||
mimemagic (= 0.3.7)!
|
|
||||||
mini_magick (~> 4.10.1)
|
mini_magick (~> 4.10.1)
|
||||||
minitest (~> 5.11.0)
|
minitest (~> 5.11.0)
|
||||||
multi_json (~> 1.14.1)
|
multi_json (~> 1.14.1)
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
source "https://rubygems.org"
|
|
||||||
|
|
||||||
# Specify your gem's dependencies in mimemagic.gemspec
|
|
||||||
gemspec
|
|
||||||
|
|
||||||
gem "rake", "~> 12.0"
|
|
|
@ -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
|
|
|
@ -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.
|
|
|
@ -1 +0,0 @@
|
||||||
This is a fake gem to prevent mimemagic from being included into GitLab.
|
|
|
@ -1,2 +0,0 @@
|
||||||
require "bundler/gem_tasks"
|
|
||||||
task :default => :spec
|
|
|
@ -1,6 +0,0 @@
|
||||||
require "mimemagic/version"
|
|
||||||
|
|
||||||
module MimeMagic
|
|
||||||
class Error < StandardError; end
|
|
||||||
raise Error, 'This gem should never be required'
|
|
||||||
end
|
|
|
@ -1,3 +0,0 @@
|
||||||
module MimeMagic
|
|
||||||
VERSION = "0.3.7"
|
|
||||||
end
|
|
|
@ -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
|
|
Loading…
Reference in New Issue