Merge branch 'release/2.2.0'

.browserslistrc

@@ -0,0 +1 @@
+defaults

.github/workflows/ci.yml

@@ -0,0 +1,51 @@
+name: CI
+
+on:
+  push:
+    branches: [develop, main, master, "feature/**"]
+  pull_request:
+    branches: [develop, main, master, "feature/**"]
+
+  # Allows workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    env:
+      DB_HOST: 127.0.0.1
+      DB_PORT: 3306
+      DB_USERNAME: root
+      DB_PASSWORD: root
+      RAILS_ENV: test
+    steps:
+      - name: Verify mysql connection
+        run: |
+          mysql --host ${{ ENV.DB_HOST }} --port ${{ ENV.DB_PORT }} -u${{ ENV.DB_USERNAME}} -p${{ ENV.DB_PASSWORD }} -e "SHOW DATABASES"
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Install dependencies
+        run: |
+          gem install bundler
+          bundle install
+          yarn install --frozen-lockfile
+      - name: Setup config files for CI
+        run: |
+          cp config/ldap_ci.yml config/ldap.yml
+      - name: Setup Database
+        run: |
+          cp config/database_ci.yml config/database.yml
+          ./bin/rails db:create
+          ./bin/rails db:migrate
+      - name: Run RSpec
+        run: bundle exec rspec

.gitignore

@@ -29,3 +29,12 @@
 config/ldap.yml
 config/database.yml
 config/secrets.yml
+
+.env*
+!.env.example
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity

.ruby-version

@@ -1 +1 @@
-2.4.1
+2.7.3

Gemfile

@@ -1,142 +1,160 @@
 source 'https://rubygems.org'
 
-gem 'passenger'
+gem 'passenger', "~> 6.0"
 
 gem 'ajax-datatables-rails', github: 'jbox-web/ajax-datatables-rails', ref: '70513cb0e0990f26b52626ba13674e67104c03c6'
 # Use OmniAuth to support any type of auth
-gem 'omniauth'
-gem 'omniauth-shibboleth'
-gem 'omniauth-shibboleth-passive'
+gem 'omniauth', "~> 1.9"
+gem 'omniauth-shibboleth', "~> 1.1"
+gem 'omniauth-shibboleth-passive', "~> 0.1"
 
 # temporary hack due to mimemagic update
 # rails 5.2.5 seems to break the app??
 
 # gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.0'
+gem 'rails', '~> 6.0'
 # Use mysql2 as the database for Active Record
-gem 'mysql2'
+gem 'mysql2', "~> 0.5"
 # Use sqlite also
-gem 'sqlite3'
+gem 'sqlite3', "~> 1.4"
 # Use Puma as the app server
-gem 'puma', '~> 3.0'
+gem 'puma', '~> 4.3'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '~> 4.2'
 # Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.2.0'
+gem 'coffee-rails', '~> 4.2'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 
-gem "lograge"
+gem "lograge", "~> 0.11"
 
 # For javascript translations
-gem "i18n-js"
+gem "i18n-js", "~> 3.7"
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', "~> 4.4"
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5.x'
+gem 'turbolinks', '~> 5.2'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
+gem 'jbuilder', '~> 2.10'
 
 # Use this as the autocompleter library
-gem 'twitter-typeahead-rails', git: 'git://github.com/pgate/twitter-typeahead-rails'
+gem 'twitter-typeahead-rails', git: 'https://github.com/pgate/twitter-typeahead-rails.git'
 
 # Use net-ldap for LDAP lookup integration
-gem 'net-ldap'
+gem 'net-ldap', "~> 0.16"
 
 # Use bootstrap for styling
-gem 'twitter-bootstrap-rails'
+gem 'twitter-bootstrap-rails', git: 'https://github.com/seyhunak/twitter-bootstrap-rails.git'
+
 # Use special bootstrap select
-gem 'bootstrap-select-rails'
+gem 'bootstrap-select-rails', "~> 1.13"
 #Use font awesome for icons
-gem "font-awesome-rails"
+gem "font-awesome-rails", "~> 4.7"
 
 #Use clipboard js plugin
-gem 'clipboard-rails'
+gem 'clipboard-rails', "~> 1.7"
 
 # better confirm dialogs
-gem 'data-confirm-modal'
+gem 'data-confirm-modal', "~> 1.6"
 
 # use papertrail for auding or versioning
-gem 'paper_trail'
+gem 'paper_trail', "~> 10.3"
 
 # Use barby to generate QR codes
-gem 'rqrcode'
-gem 'barby'
-gem 'chunky_png'
+gem 'rqrcode', "~> 1.1"
+gem 'barby', "~> 0.6"
+gem 'chunky_png', "~> 1.3"
 
 # authorization lugin
-gem 'pundit'
+gem 'pundit', "~> 2.1"
 
 # announcements to the seething masses
 # https://github.com/csm123/starburst#
-gem 'starburst',  git: 'git://github.com/csm123/starburst'
+gem 'starburst',  git: 'https://github.com/csm123/starburst.git'
 
 #notify someone when exceptions occur
 #and notify slack channel
-gem 'exception_notification'
-gem 'slack-notifier'
+gem 'exception_notification', "~> 4.4"
+gem 'slack-notifier', "~> 2.3"
 
 # For URL migration
-gem 'addressable'
+gem 'addressable', "~> 2.8"
 
 # For API Authentication
-gem 'jwt'
+gem 'jwt', "~> 2.2"
+
+gem "sentry-ruby", "~> 4.4"
+gem "sentry-rails", "~> 4.4"
 
-gem "sentry-ruby"
-gem "sentry-rails"
+# Load ENV variables from .env file
+gem 'dotenv-rails', "~> 2.7"
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a
   # debugger console
-  gem 'byebug', platform: :mri
+  gem 'byebug', "~> 11.1", platform: :mri
+
+  # Use Rspec, capybara, and apparition for testing
+  gem 'rspec-rails', "~> 4.0"
+  gem 'capybara', "~> 3.15"
+  gem 'capybara-screenshot', "~> 1.0"
+
+  # Using github for source until change in twalpole/apparition#79
+  # is released. Change back to gem version after.
+  gem 'apparition', github: 'twalpole/apparition', ref: 'ca86be4'
+  gem 'launchy', "~> 2.4"
+  gem 'factory_bot_rails', "~> 6.2"
+  gem 'database_cleaner', "~> 1.8"
+  gem 'fuubar', "~> 2.5"
 
-  # Use Rspec, capybara, and poltergeist for testing
-  gem 'rspec-rails'
-  gem 'capybara'
-  gem 'poltergeist'
-  gem 'launchy'
-  gem 'factory_girl_rails'
-  gem 'database_cleaner'
-  gem 'fuubar'
+  # for retrying flaky tests until they can be fixed
+  gem "rspec-retry", "~> 0.6"
+
+  # Watch files for changes and re-run tests
+  gem 'guard', "~> 2.17"
+  gem 'guard-rspec', "~> 4.7", require: false
 
   # Add some pry/rails console helpers for development
-  gem 'pry', '0.12.2'
-  gem 'pry-coolline'
-  gem 'pry-byebug'
-  gem 'awesome_print'
-  gem 'pry-rails'
+  gem 'pry', '~> 0.13'
+  gem 'pry-byebug', "~> 3.9"
+  gem 'awesome_print', "~> 1.8"
+  gem 'pry-rails', "~> 0.3"
 end
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere
   # in the code.
-  gem 'web-console'
-  gem 'listen', '~> 3.0.5'
+  gem 'web-console', "~> 3.7"
+  gem 'listen', '~> 3.0'
   # Spring speeds up development by keeping your application running in the
   # background. Read more: https://github.com/rails/spring
 
   # Use better_errors to have more clear error messages and an interactive shell
-  gem 'better_errors'
-  gem 'binding_of_caller'
+  gem 'better_errors', "~> 2.7"
+  gem 'binding_of_caller', "~> 0.8"
 
   # rubocop for styled code
-  gem 'rubocop', '~> 0.47.1', require: false
+  gem 'rubocop', '~> 0.47', require: false
 
   # Use annotate to list the attributes of models
-  gem 'annotate'
-
-  gem 'capistrano'
-  gem 'capistrano-bundler'
-  gem 'capistrano-passenger', '>= 0.1.1'
-  gem 'capistrano-rbenv'
-  gem 'capistrano-rails'
+  gem 'annotate', "~> 3.1"
+
+  gem 'capistrano', "~> 3.14"
+  gem 'capistrano-bundler', "~> 1.6"
+  gem 'capistrano-passenger', '~> 0.2'
+  gem 'capistrano-rbenv', "~> 2.1"
+  gem 'capistrano-rails', "~> 1.5"
+  gem 'ed25519', "~> 1.2"
+  gem 'bcrypt_pbkdf', "~> 1.1"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'browser'
+gem 'browser', "~> 4.2"
+
+gem "webpacker", "~> 5.4"