Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions comfortable_mexican_sofa.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ Gem::Specification.new do |s|
s.add_dependency "haml-rails", ">= 1.0.0"
s.add_dependency "jquery-rails", ">= 4.3.1"
s.add_dependency "kramdown", ">= 1.0.0"
s.add_dependency "mimemagic", ">= 0.3.2"
s.add_dependency "marcel", ">= 1.0.0"
s.add_dependency "mini_magick", ">= 4.8.0"
s.add_dependency "rails", ">= 5.2.0"
s.add_dependency "rails", ">= 5.2.0", "< 6.1.0"
s.add_dependency "rails-i18n", ">= 5.0.0"
s.add_dependency "sassc-rails", ">= 2.0.0"
end
2 changes: 1 addition & 1 deletion lib/comfortable_mexican_sofa/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module ComfortableMexicanSofa::Seeds

class Error < StandardError; end

require "mimemagic"
require "marcel"

class Importer

Expand Down
2 changes: 1 addition & 1 deletion lib/comfortable_mexican_sofa/seeds/file/importer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def import!
file.file = {
io: file_handler,
filename: filename,
content_type: MimeMagic.by_magic(file_handler)
content_type: Marcel::Magic.by_magic(file_handler)
}
end

Expand Down
2 changes: 1 addition & 1 deletion lib/comfortable_mexican_sofa/seeds/page/importer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def files_content(record, identifier, path, frag_content)
{
io: file_handler,
filename: filename,
content_type: MimeMagic.by_magic(file_handler)
content_type: Marcel::Magic.by_magic(file_handler)
}
end

Expand Down
2 changes: 1 addition & 1 deletion test/gemfiles/6.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "http://rubygems.org"

gemspec path: "../../"

gem "rails", ">= 6.0"
gem "rails", ">= 6.0", "< 6.1"

group :development, :test do
gem "byebug", "~> 10.0.0", platforms: %i[mri mingw x64_mingw]
Expand Down