[fix]Fix ruby version and update mimemagic

This commit is contained in:
Jimmy 2021-04-07 23:22:40 +08:00 committed by CactusPuppy
parent c6e1082213
commit a287c0415a
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
3 changed files with 6 additions and 4 deletions

View file

@ -2,7 +2,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby ENV['TRAVIS_RUBY_VERSION'] || '2.6.6' ruby ENV['TRAVIS_RUBY_VERSION'] || '~>2.6.6'
# rails-assets requires >= 1.8.4 # rails-assets requires >= 1.8.4
if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')
@ -28,6 +28,7 @@ gem 'paper_trail'
gem 'carrierwave' gem 'carrierwave'
gem 'carrierwave-bombshelter' gem 'carrierwave-bombshelter'
gem 'mini_magick' gem 'mini_magick'
gem 'mimemagic', '~> 0.3.6'
# for internationalizing # for internationalizing
gem 'rails-i18n' gem 'rails-i18n'

View file

@ -299,7 +299,9 @@ GEM
mime-types (3.3.1) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225) mime-types-data (3.2021.0225)
mimemagic (0.3.6) mimemagic (0.3.10)
nokogiri (~> 1)
rake
mina (1.2.3) mina (1.2.3)
open4 (~> 1.3.4) open4 (~> 1.3.4)
rake rake
@ -721,6 +723,7 @@ DEPENDENCIES
leaflet-rails leaflet-rails
letter_opener letter_opener
letter_opener_web (~> 1.0) letter_opener_web (~> 1.0)
mimemagic (~> 0.3.6)
mina mina
mini_magick mini_magick
money-rails money-rails

View file

@ -82,5 +82,3 @@
- if @conference.contact.has_social_media? - if @conference.contact.has_social_media?
= render 'social_media', contact: @conference.contact = render 'social_media', contact: @conference.contact
= render 'footer' = render 'footer'
'test'