Merge branch 'master' into 177261601-embed-happening-now-events-in-conference-splashpage

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')
@@ -27,6 +27,7 @@ gem 'paper_trail'
 # for upload management
 gem 'carrierwave'
 gem 'carrierwave-bombshelter'
+gem 'mimemagic', '~> 0.3.6'
 gem 'mini_magick'
 
 # for internationalizing

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

spec/datatables/user_datatable_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe UserDatatable do
-  subject! do
+  subject!(:user_datatable) do
     described_class.new(view)
   end
 
@@ -90,9 +90,9 @@ describe UserDatatable do
     it { is_expected.to respond_to(:view_columns) }
   end
 
-  context 'outputs' do
+  skip 'outputs' do
     let(:user) { User.first }
-    let(:output) { subject.as_json }
+    let(:output) { user_datatable.as_json }
 
     it 'recordsTotal' do
       expect(output[:recordsTotal]).to eq(1)