Release 1.21.0 (#677)

* Fixes Apple M1 Issue w/ Docker (#672)
  - This causes problems in docker+apple m1
      (`ActiveSupport::EventedFileUpdateChecker`
      isn't working on Docker for Apple Silicon (M1) at the moment.)
      More here: evilmartians/terraforming-rails#34
  - Make sure we use amd64 for Mac OS X M1 compatibility

* Update Dependencies for May 2022 (#673)
  - ruby: Upgrade Ruby from 2.7.5 to 2.7.6
  - Gemfile.lock: Update nokogiri from 1.13.3 to 1.13.6
  - Gemfile[.lock]: Update rails (5.2.6.3 --> 5.2.8) and its dependencies
      Also updates a few indirect dependencies.
      Specifically: concurrent-ruby, i18n, loofah, mini_mime, and thor.
  - Gemfile.lock: Update puma from 5.6.2 to 5.6.4
  - yarn.lock: Update minimist from 1.2.5 to 1.2.6
  - yarn.lock: Update node-forge from 1.2.1 to 1.3.1
  - yarn.lock: Update swagger-ui from 4.1.3 to 4.7.0
      Also update some of its dependencies, such as @braintree/sanitize-url.
  - yarn.lock: Update async from 2.6.3 to 2.6.4
  - Revert "yarn.lock: Update swagger-ui from 4.1.3 to 4.7.0"
      It broke when updating, not sure why. Possibly webpack-related???
      Back to swagger-ui 4.1.3.
  - deps: Resolve @braintree/sanitize-url to v6.x
      Was v5.x. (This is a JS dependency, in package.json and yarn.lock.)
  - yarn.lock: Update eventsource from 1.0.7 to 1.1.1
  - Gemfile.lock: Update rack from 2.2.3 to 2.2.3.1

* update to new maps public key (#675)
  - update to new public key
  - upgrade to rails 6
  - add net gems to Gemfile
  - update lock file
  - fix linting errors with upgrade
  - use proper "visible" syntax
  - update API gems
  - change to old css rspec helper

* Update dependencies for early October 2022 (#676)
  - yarn.lock: Update terser
  - yarn.lock: Dedupe dependencies
  - ruby: Bump Ruby from 3.1.0 to 3.1.2
      (Was recently updated from 2.7.6 to 3.1.0 in PR 675)

Co-authored-by: Mikena Wood <mi-wood@users.noreply.github.com>
Co-authored-by: Ernesto Tagwerker <ernesto+github@ombulabs.com>

.env

@@ -1,4 +1,4 @@
-export DEVISE_SECRET_KEY=3f4915489bd10fdbacb4f22dbf772a4be6e2d2d1616a1af7913f0f6645784ddffd6a71ab9f69a99ed7941f16d3092e1872bc4bc9add5a0615c630c90f94fc032
-export RAILS_SECRET_KEY=4944cf251e3dbf309ed71ebcd8990a1479d793011cd4011761e3fbea9ecc59edefd0cb49a0ed9b5c0261ab0dda841962bb7dd28fd3f99579bfa2beec26329961
-export RECAPTCHA_SITE_KEY=6Le_W5gUAAAAAJFOELNu2LkSR2E6sXYIVZrMe6V0
-export RECAPTCHA_SECRET_KEY=6Le_W5gUAAAAABZpnGQtfVaQdfluuLrf8wihooeo
+DEVISE_SECRET_KEY=3f4915489bd10fdbacb4f22dbf772a4be6e2d2d1616a1af7913f0f6645784ddffd6a71ab9f69a99ed7941f16d3092e1872bc4bc9add5a0615c630c90f94fc032
+RAILS_SECRET_KEY=4944cf251e3dbf309ed71ebcd8990a1479d793011cd4011761e3fbea9ecc59edefd0cb49a0ed9b5c0261ab0dda841962bb7dd28fd3f99579bfa2beec26329961
+RECAPTCHA_SITE_KEY=6Le_W5gUAAAAAJFOELNu2LkSR2E6sXYIVZrMe6V0
+RECAPTCHA_SECRET_KEY=6Le_W5gUAAAAABZpnGQtfVaQdfluuLrf8wihooeo

.rubocop.yml

@@ -38,7 +38,7 @@ Style/StringLiterals:
   Enabled: false
 
 Metrics/BlockLength:
-  ExcludedMethods:
+  AllowedMethods:
     - describe
     - context
     - factory

.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.5-slim
+FROM ruby:3.1.2-slim
 
 # Add basic binaries
 RUN apt-get update \

Gemfile

@@ -1,26 +1,29 @@
 source 'https://rubygems.org'
-ruby '2.7.5'
+ruby '3.1.2'
 
-gem 'rails', '5.2.6.3'
+gem 'rails', '6.1.7'
 
 gem 'activeadmin', '~> 2.1'
 gem 'bootsnap', require: false
 gem 'bootstrap-sass', '>= 3.4.1'
 gem 'bugsnag'
 gem 'coffee-rails', '~> 4.2'
 gem 'country_select'
-gem 'devise', '~> 4.6'
+gem 'devise', '~> 4.8.1'
 gem 'geocoder', '~> 1.6.1'
-gem 'grape', '~> 1.3.0'
+gem 'grape', '~> 1.6.2'
 gem 'grape-swagger'
-gem 'grape-kaminari'
+gem 'grape-kaminari', '~> 0.4.3'
 gem 'haml'
 gem 'high_voltage', '~> 3.0.0'
 gem 'http_accept_language'
 gem 'jbuilder', '~> 2.5'
-gem 'kaminari', '~> 1.1'
+gem 'kaminari', '~> 1.2.2'
 gem 'kaminari-grape', '~> 1.0'
 gem 'mail_form', '>= 1.7.0'
+gem 'net-smtp', require: false
+gem 'net-imap', require: false
+gem 'net-pop', require: false
 gem 'pg'
 gem 'pg_search'
 gem 'puma'
@@ -37,9 +40,7 @@ gem 'webpacker', '~> 5'
 group :development, :test do
   gem 'better_errors', '~> 2.9.1'
   gem 'binding_of_caller'
-  gem 'dotenv-rails', '~> 2.2.1'
   gem 'factory_bot_rails', '~> 4.8.2'
-  gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'pry'
   gem 'rspec-rails'
   gem 'rubocop', require: false