Merge branch 'rails6' into development

.gitignore

@@ -48,3 +48,4 @@ tags
 /**/svg-source
 
 .env
+config/locales/.DS_Store

.ruby-version

@@ -1 +1 @@
-2.3.7
+2.7.1

.travis.yml

@@ -2,13 +2,12 @@ dist: xenial
 sudo: false
 language: ruby
 
-
-rvm: 2.3.7
+rvm: 2.7.1
 
 jobs:
   include:
     - stage: test for pry
-      rvm: 2.7.0
+      rvm: 2.7.1
       before_install:
       - bash travis/.travis_pry.sh
       install: skip
@@ -30,6 +29,7 @@ before_install:
   - 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
+  - sudo apt-get install firefox-geckodriver
   - export QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
   - qtchooser -qt=qt5
   - mysql -e 'CREATE DATABASE test;'
@@ -49,3 +49,4 @@ branches:
     - development
     - fromthepage.com
     - indianapolis
+    - rails6

Capfile

@@ -3,7 +3,9 @@ require 'capistrano/setup'
 
 # Includes default deployment tasks
 require 'capistrano/deploy'
+#require 'rvm/capistrano'
 require 'rvm1/capistrano3'
+#require 'capistrano/rvm'
 
 # Includes tasks from other gems included in your Gemfile
 #
@@ -24,3 +26,5 @@ require 'capistrano/rails/migrations'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
+#append :linked_dirs, '.bundle'
+#append :rvm_map_bins, 'gem', 'ruby', 'bundle'

Gemfile

@@ -1,20 +1,18 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.1.2'
-
+gem 'rails', '6.0.3.2'
 
 gem 'will_paginate'
-#gem 'rmagick', '2.13.2', require: "RMagick"
 gem 'rmagick'
 gem 'nokogiri'
-gem 'oai', git: 'https://github.com/mispy/ruby-oai.git'
-gem 'capistrano', '~> 3.4.0'
-gem 'capistrano-rails', '= 1.1.3'
-gem 'capistrano-bundler', '~> 1.1.2'
+gem 'oai'
+gem "capistrano", "~> 3.10", require: false
+gem "capistrano-rails", "~> 1.4", require: false
+gem 'capistrano-bundler', '~> 1.6'
 gem 'rvm1-capistrano3', require: false
 gem 'jquery-rails'
 gem 'savon', '~> 2.12.0'
-gem 'mysql2','0.3.21'
+gem 'mysql2'
 
 gem "recaptcha", require: "recaptcha/rails"
 
@@ -26,15 +24,18 @@ gem 'acts_as_tree'
 gem 'devise'
 gem 'devise-encryptable'
 
-gem 'protected_attributes'
 gem 'carrierwave'
 gem 'rubyzip'
-gem 'render_anywhere'
 
 gem 'ahoy_matey'
+
+gem "browser", "~> 2.0"
+gem "user_agent_parser"
+
 gem 'pry'
 gem 'oink'
 
+gem 'iiif-image-api', git: 'https://github.com/samvera-labs/iiif-image-api.git'
 gem 'riiif'
 gem 'iiif-presentation', git: 'https://github.com/benwbrum/osullivan', branch: 'service_is_array'
 
@@ -43,15 +44,24 @@ gem 'omniauth-google-oauth2'
 
 gem 'rack-reverse-proxy', :require => 'rack/reverse_proxy'
 
+gem 'bootsnap', require: false
+
+gem 'puma'
+
+gem 'active_link_to'
+
+gem 'warning'
+
+gem 'rails-i18n', '~> 6.0.0'
 
 group :assets do
-  gem 'therubyracer'
   gem 'uglifier'
 end
 
 group :test do
   gem 'database_cleaner'
   gem 'capybara'
+  gem 'selenium-webdriver'
   gem 'shoulda'
   gem 'webmock', require: false
   gem 'vcr'
@@ -61,7 +71,6 @@ end
 group :development, :test do
   gem 'rspec-rails'
   gem 'launchy'
-  gem 'capybara-webkit'
   gem 'pry-byebug'
   gem 'factory_bot_rails'
   gem 'pry-awesome_print' # makes console output easy to read
@@ -70,16 +79,17 @@ group :development, :test do
   # Supporting gem for RailsPanel
   # https://github.com/dejan/rails_panel
   gem 'bullet'
+  gem 'listen'
 end
 
 # Use SassC for stylesheets
 gem 'sassc-rails'
 
 # Use Autoprefixer for vendor prefixes
-gem 'autoprefixer-rails', '<= 8.6.5'
+gem 'autoprefixer-rails'
 
 # Use Slim for templates
-gem 'slim', '~> 3.0.0'
+gem 'slim'
 
 # Gravatar Image Tag
 gem 'gravatar_image_tag'
@@ -94,9 +104,6 @@ gem 'friendly_id'
 gem 'rtl'
 gem 'iso-639'
 
-# Quiet asset lines in log files
-gem 'quiet_assets', '~> 1.1.0', group: :development
-
 # Profiling for use in prod
 gem 'flamegraph'
 gem 'memory_profiler'