Merge branch 'development'

.travis.yml

@@ -7,7 +7,7 @@ rvm: 2.3.7
 jobs:
   include:
     - stage: test for pry
-      rvm: 2.4.1
+      rvm: 2.7.0
       before_install:
       - bash travis/.travis_pry.sh
       install: skip
@@ -26,6 +26,7 @@ jobs:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install ghostscript
+  - sudo apt-get install poppler-utils
   - sudo apt-get install graphviz
   - sudo apt-get install g++ qt5-default libqt5webkit5-dev gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x
   - export QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake

Gemfile

@@ -23,7 +23,7 @@ gem 'omeka_client', git: 'https://github.com/benwbrum/omeka_client'
 gem 'acts_as_list'
 gem 'acts_as_tree'
 
-gem 'devise', '3.4.1'
+gem 'devise'
 gem 'devise-encryptable'
 
 gem 'protected_attributes'
@@ -71,8 +71,8 @@ group :development, :test do
   gem 'bullet'
 end
 
-# Use SASS for stylesheets
-gem 'sass-rails', '~> 5.0.0'
+# Use SassC for stylesheets
+gem 'sassc-rails'
 
 # Use Autoprefixer for vendor prefixes
 gem 'autoprefixer-rails', '~>8'
@@ -102,3 +102,5 @@ gem 'memory_profiler'
 gem 'meta_request'
 gem 'rack-mini-profiler'
 gem 'stackprof'
+
+gem 'intercom', '~> 3.9.0'

Gemfile.lock

@@ -59,8 +59,8 @@ GEM
       activerecord (>= 3.0)
     acts_as_tree (2.9.0)
       activerecord (>= 3.0.0)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ahoy_matey (1.6.1)
       addressable
       browser (~> 2.0)
@@ -86,13 +86,12 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    browser (2.5.3)
+    browser (2.6.1)
     builder (3.2.3)
     bullet (6.0.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.0.1)
-    callsite (0.0.11)
     capistrano (3.4.1)
       i18n
       rake (>= 10.0.0)
@@ -129,12 +128,11 @@ GEM
       safe_yaml (~> 1.0.0)
     database_cleaner (1.7.0)
     debug_inspector (0.0.3)
-    devise (3.4.1)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
@@ -143,38 +141,40 @@ GEM
       railties (>= 3.0)
     diff-lcs (1.3)
     docile (1.3.2)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     errbase (0.1.1)
-    erubi (1.8.0)
+    erubi (1.9.0)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.11.1)
     flamegraph (0.9.5)
-    friendly_id (5.2.5)
+    friendly_id (5.3.0)
       activerecord (>= 4.0.0)
-    geocoder (1.5.1)
+    geocoder (1.5.2)
     gravatar_image_tag (1.2.0)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashdiff (0.4.0)
+    hashdiff (1.0.0)
     hashie (3.6.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpi (2.4.4)
       rack
       socksify
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    intercom (3.9.0)
     iso-639 (0.2.8)
     jquery-rails (3.1.5)
       railties (>= 3.0, < 5.0)
@@ -188,16 +188,15 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memory_profiler (0.9.14)
-    meta_request (0.7.0)
-      callsite (~> 0.0, >= 0.0.11)
+    meta_request (0.7.2)
       rack-contrib (>= 1.1, < 3)
       railties (>= 3.0.0, < 7)
     method_source (0.9.2)
     mime-types (1.25.1)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.12.2)
+    multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.3.21)
@@ -209,8 +208,8 @@ GEM
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     nori (2.6.0)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -241,15 +240,15 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.1.0)
+    public_suffix (4.0.1)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.5.5)
     rack-attack (5.4.2)
       rack (>= 1.0, < 3)
     rack-contrib (1.8.0)
       rack (~> 1.4)
-    rack-mini-profiler (1.0.2)
+    rack-mini-profiler (1.1.1)
       rack (>= 1.2.0)
     rack-proxy (0.6.5)
       rack
@@ -273,11 +272,8 @@ GEM
       activesupport (= 4.1.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    recaptcha (5.0.0)
+    rake (13.0.0)
+    recaptcha (5.2.1)
       json
     recursive-open-struct (0.4.5)
     ref (2.0.0)
@@ -291,51 +287,49 @@ GEM
     rest (2.6.5)
       net-http-persistent
       rest-client (>= 0.3.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     riiif (0.4.1)
       rails (> 3.2.0)
-    rmagick (3.1.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rmagick (4.0.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     rtl (0.2.4)
-    ruby-saml (1.10.2)
+    ruby-saml (1.11.0)
       nokogiri (>= 1.5.10)
-    rubyzip (1.2.3)
+    rubyzip (1.3.0)
     rvm1-capistrano3 (1.4.0)
       capistrano (~> 3.0)
       sshkit (>= 1.2)
     safe_yaml (1.0.5)
-    safely_block (0.2.1)
-      errbase
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    safely_block (0.2.2)
+      errbase (>= 0.1.1)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     savon (2.12.0)
       akami (~> 1.2)
       builder (>= 2.1.2)
@@ -366,31 +360,31 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sshkit (1.18.2)
+    sshkit (1.20.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    stackprof (0.2.12)
-    temple (0.8.1)
+    stackprof (0.2.13)
+    temple (0.8.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tins (1.21.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.20)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    uniform_notifier (1.12.1)
+    uniform_notifier (1.13.0)
     user_agent_parser (2.5.1)
     uuidtools (2.1.5)
     vcr (5.0.0)
@@ -399,11 +393,11 @@ GEM
     wasabi (3.5.0)
       httpi (~> 2.0)
       nokogiri (>= 1.4.2)
-    webmock (3.6.0)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    will_paginate (3.1.7)
+    will_paginate (3.2.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -426,14 +420,15 @@ DEPENDENCIES
   carrierwave
   coveralls
   database_cleaner
-  devise (= 3.4.1)
+  devise
   devise-encryptable
   devise_masquerade
   factory_bot_rails
   flamegraph
   friendly_id
   gravatar_image_tag
   iiif-presentation!
+  intercom (~> 3.9.0)
   iso-639
   jquery-rails
   launchy
@@ -461,7 +456,7 @@ DEPENDENCIES
   rtl
   rubyzip
   rvm1-capistrano3
-  sass-rails (~> 5.0.0)
+  sassc-rails
   savon (~> 2.12.0)
   shoulda
   slim (~> 3.0.0)