merge in changes from dev branch

Author: ipatch

.gitignore

@@ -59,3 +59,9 @@ scratchpad.txt
 # rails 5.2.x artifacts
 **/node_modules/**
 yarn.lock
+
+# ignore local symlink to chrisrjones_client project
+chrisrjones_client-react
+
+# asdf
+.tool-versions

.wiki

@@ -6,15 +6,17 @@ source 'https://rubygems.org'
 
 # `~>` denotes bundler will only install minor updates
 
-ruby '2.7.0'
+# ruby '2.7.2'
+# ruby '3.0.0' # nova
 
 gem 'rails', '~> 5.2.3'
 
 gem 'bcrypt', '~> 3.1.12' # `has_secure_password` requires this
 gem 'bootstrap-sass', '~> 3.4.1'
 gem 'jquery-rails', '~> 4.3.3'
 gem 'jquery-ui-rails', '~> 6.0', '>= 6.0.1'
-gem 'pg', '~> 1.1.4'
+# gem 'pg', '~> 1.1.4'
+gem 'pg'
 gem 'uglifier', '~> 4.1.20' # compress assets, ie. js css
 
 # gem 'sassc-rails' # replaces `sass-rails`
@@ -36,10 +38,11 @@ gem 'rack-cors', '~> 1.0.5'
 # gem 'active_model_serializers', '~> 0.10.9' #Api Gems
 
 gem 'acts_as_list', '~> 0.9.19' # sort objects, "Simple CMS"
-gem 'binding_of_caller', '~> 0.8.0' # irb in error window
+# gem 'binding_of_caller', '~> 0.8.0' # irb in error window
+gem 'binding_of_caller' # , '~> 0.8.0' # irb in error window
 
-gem 'addressable', '~> 2.6.0' # emojis in URLs
-gem 'nokogiri', '~> 1.10.8' # XML HTML parser
+gem 'addressable', '~> 2.8.0' # emojis in URLs
+gem 'nokogiri'# , '~> 1.10.8' # XML HTML parser
 
 gem 'capistrano', '~> 3.12'
 gem 'capistrano-bundler', '~> 1.5'
@@ -52,7 +55,8 @@ group :development, :test do
   # gem 'debugger' # DEPRECATED, use `byebug`
   # gem 'byebug'
   gem 'factory_bot_rails', '~> 4.0' # 5.0.1 4.11.1
-  gem 'pry', '~> 0.12.2' # add gem to debug rails
+  # gem 'pry', '~> 0.12.2' # add gem to debug rails
+  gem 'pry' # , '~> 0.12.2' # add gem to debug rails
   gem 'rspec-rails', '~> 3.5'
 end