diff --git a/Gemfile b/Gemfile index 87a01972..67c618d8 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ 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 if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') @@ -28,6 +28,7 @@ gem 'paper_trail' gem 'carrierwave' gem 'carrierwave-bombshelter' gem 'mini_magick' +gem 'mimemagic', '~> 0.3.6' # for internationalizing gem 'rails-i18n' diff --git a/Gemfile.lock b/Gemfile.lock index 0b5deb2f..5b7365da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -299,7 +299,9 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mina (1.2.3) open4 (~> 1.3.4) rake @@ -721,6 +723,7 @@ DEPENDENCIES leaflet-rails letter_opener letter_opener_web (~> 1.0) + mimemagic (~> 0.3.6) mina mini_magick money-rails diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index 39b5e380..c34aa3c1 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -82,5 +82,3 @@ - if @conference.contact.has_social_media? = render 'social_media', contact: @conference.contact = render 'footer' - -'test'