Merge branch '2.0'

* 2.0: (48 commits)
  fix(questionnaire): added phone number requirements (codeRIT#283)
  fix: School text-box dropdown in manage/questionnaires/edit missing background  (codeRIT#296)
  fix: Fixes failing test cases from codeRIT#242 (codeRIT#364)
  refactor: Renames user roles, improves security
  fix: Text centering on application page  (codeRIT#361)
  fix(bus_captain): Alerts admins if a bus captain is removed (codeRIT#270)
  feat: Automatically remind people to RSVP (codeRIT#175)
  fix: Hackathon names now consistently on newline, wrapping is centered (codeRIT#358)
  feat(questionnaires): Allows directors to block new questionnaires (codeRIT#279)
  refactor: Adds GSDP info, cleans Dokku docs (codeRIT#356)
  refactor: Cleans Questionnaire for MyMLH V3 (codeRIT#338)
  refactor(docs): Updates Environment Variable docs (codeRIT#300)
  refactor: Redesigns password reset pages (codeRIT#308)
  fix(dashboard): Map data refactored for faster load times (codeRIT#269)
  refactor: Updates 24hr reminder to remove MyMLH reference (codeRIT#302)
  refactor: Renames "Guides" to "Docs" (codeRIT#353)
  fix(docs): Refactors page titles and makes API pages visible again (codeRIT#320)
  build(deps): Updates Rails to 5.2.4.4 (codeRIT#349)
  build(deps): Updates ChartKick to 3.4 (codeRIT#347)
  refactor(docs): Updates Messages and customization instructions (codeRIT#321)
  ...

.env.example

@@ -5,4 +5,4 @@ AWS_ACCESS_KEY_ID="abc"
 AWS_SECRET_ACCESS_KEY="123"
 AWS_REGION="us-east-1"
 AWS_ENDPOINT=""
-SPARKPOST_API_KEY="foo"
+SENDGRID_API_KEY="foo"

.gitignore

@@ -23,6 +23,8 @@
 /public/assets
 .byebug_history
 
+/coverage
+
 # Ignore master key for decrypting credentials and more.
 /config/master.key
 
@@ -33,3 +35,6 @@
 /.idea
 
 .generators
+
+# macOS
+.DS_Store

.ruby-version

@@ -1 +1 @@
-2.6.5
+2.6.6

CHANGELOG.md

@@ -1,6 +1,5 @@
 ## [1.22.4](https://github.com/codeRIT/hackathon-manager/compare/v1.22.3...v1.22.4) (2020-05-26)
 
-
 ### Bug Fixes
 
 * **questionnaire:** Fixes error when trying to view a questionnaire modified by a deleted admin ([#236](https://github.com/codeRIT/hackathon-manager/issues/236)) ([](https://github.com/codeRIT/hackathon-manager/commit/2ffe116))

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '>= 2.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.4.3'
+gem 'rails', '~> 5.2.4.4'
 # Use mysql as the database for Active Record
 gem 'mysql2', '>= 0.4.4', '< 0.6.0'
 # Use Puma as the app server
@@ -39,7 +39,7 @@ gem 'bootsnap', '>= 1.1.0', require: false
 
 # Authentication
 gem 'devise', '~> 4.7'
-gem 'omniauth-mlh', '~> 0.1'
+gem 'omniauth-mlh', '~> 0.4.1'
 gem 'doorkeeper', '~> 5.0'
 gem 'devise-doorkeeper'
 gem 'omniauth-rails_csrf_protection'
@@ -82,10 +82,9 @@ gem 'sidekiq-cron', '~> 1.1'
 gem 'rails-settings-cached', '~> 0.7.2'
 gem 'blazer'
 gem 'simple_spark'
-gem 'sparkpost_rails'
+gem 'sendgrid-actionmailer'
 gem 'httparty'
 gem 'rollbar', '~> 2.8'
-gem 'skylight'
 gem 'rubyzip', '>= 1.3.0'
 gem 'rails_12factor', group: :production