Fix deployment and asset compilation

.gitignore

@@ -86,3 +86,4 @@ spec/carrierwave
 # Ignore credentials
 /config/master.key
 /config/credentials.yml.enc
+/config/credentials/*

Gemfile

@@ -13,7 +13,7 @@ gem 'ancestry'
 # SASS for stylesheets
 gem 'sass-rails', '~> 6'
 # Compress JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'terser', '~> 1.2'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 5'
 # Easy styling

Gemfile.lock

@@ -464,15 +464,15 @@ GEM
     strscan (3.1.0)
     sysexits (1.2.0)
     temple (0.10.3)
+    terser (1.2.3)
+      execjs (>= 0.3.0, < 3)
     thor (1.3.1)
     tilt (2.3.0)
     timeout (0.4.1)
     tournament-system (2.1.0)
       graph_matching (~> 0.1.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uglifier (4.2.0)
-      execjs (>= 0.3.0, < 3)
     unicode-display_width (2.5.0)
     uniform_notifier (1.16.0)
     warden (1.2.9)
@@ -540,8 +540,8 @@ DEPENDENCIES
   simplecov
   spring
   sprockets-rails
+  terser (~> 1.2)
   tournament-system (~> 2.0)
-  uglifier (>= 1.3.0)
   will_paginate (~> 3.3.0)
   will_paginate-bootstrap4
 

config/deploy.rb

@@ -1,8 +1,8 @@
 # config valid only for current version of Capistrano
-lock '3.17.0'
+lock '3.18.1'
 
 set :application, 'citadel'
-set :rvm_ruby_string, 'ruby-2.5.0'
+set :rvm_ruby_string, 'ruby-3.1.2'
 
 # git settings
 set :repo_url, '[email protected]:ozfortress/citadel.git'
@@ -23,7 +23,7 @@
 set :pty, true
 
 # Files and folders to keep between deployments
-set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/credentials.yml.enc', 'master.key', 'config/news.yml')
+set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/credentials/production.yml.enc', 'config/credentials/production.key', 'config/news.yml')
 set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp', 'vendor/bundle', 'public/uploads')
 
 # Default value for default_env is {}

config/environments/production.rb

@@ -23,7 +23,7 @@
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = :terser
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.