Merge branch 'master' into roster-add-active-job

Author: shaunakpp

.rubocop.yml

@@ -19,11 +19,11 @@ TrailingBlankLines:
 Documentation:
   Enabled: false
 
-Metrics/ClassLength:
-  Max: 120
-
 Metrics/LineLength:
-  Max: 120
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
 
 Metrics/BlockLength:
   Exclude:

.ruby-version

@@ -1 +1 @@
-2.4.2
+2.6.4

.scss-lint.yml

@@ -10,6 +10,7 @@ scss_files: './app/assets/stylesheets'
 
 # primer-dropdown.css was ported from the Primer repo, already has sass linting
 exclude: './app/assets/stylesheets/components/primer-dropdown.scss'
+exclude: './app/assets/stylesheets/components/primer-select-menu.scss'
 
 linters:
   BangFormat:

.travis.yml

@@ -13,6 +13,7 @@ before_install:
   - sudo service postgresql stop && sudo service postgresql start $DB_VERSION
   - echo "Using postgres version $(psql -U postgres -tc 'SHOW server_version')"
   - gem update --system
+  - gem install bundler
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.24.6
   - export PATH=$HOME/.yarn/bin:$PATH
 

CODEOWNERS

@@ -3,6 +3,6 @@
 
 *               @education/classroom-reviewers
 
-README.md       @mozzadrella
+README.md       @d12
 ROADMAP.md      @mozzadrella
-CONTRIBUTING.md @mozzadrella
+CONTRIBUTING.md @d12

Gemfile

@@ -13,7 +13,7 @@ gem "rails", "~> 5.2.3"
 gem "autoprefixer-rails", "~> 7.1", ">= 7.1.3"
 
 gem "barnes"
-gem "bootsnap", "~> 1.1", ">= 1.1.2", require: false
+gem "bootsnap", "~> 1.4", ">= 1.4.4", require: false
 
 gem "connection_pool", "~> 2.2", ">= 2.2.1"
 
@@ -46,7 +46,7 @@ gem "ims-lti", "~> 2.2.3"
 gem "local_time", "~> 2.0"
 
 gem "oauth",           "~> 0.5.4"
-gem "octicons_helper", "~> 2.1"
+gem "octicons_helper", "~> 9.1.1"
 gem "octokit", github: "octokit/octokit.rb"
 gem "octopoller",      "~> 0.1"
 gem "omniauth-github", "~> 1.3"
@@ -60,14 +60,14 @@ gem "peek-pg",              "~> 1.3"
 gem "peek-sidekiq",         "1.0.4"
 gem "pg",                   "~> 1.1.4"
 gem "pg_search",            "~> 2.2"
-gem "pry-byebug",           "~> 3.5"
-gem "pry-rails",            "~> 0.3.6"
+gem "pry-byebug",           "~> 3.7"
+gem "pry-rails",            "~> 0.3.9"
 gem "puma",                 "~> 4.0", ">= 4.0.1"
 
 gem "rack-canonical-host", "~> 0.2.3"
 gem "rack-rewrite",        "~> 1.5.0"
-gem "rack-timeout",        "~> 0.4.2", require: false
-gem "rails-i18n",          "~> 5.0", ">= 5.0.1"
+gem "rack-timeout",        "~> 0.5.1", require: false
+gem "rails-i18n",          "~> 5.1", ">= 5.1.3"
 gem "redis-namespace",     "~> 1.5", ">= 1.5.3"
 gem "ruby-progressbar",    "~> 1.8", ">= 1.8.1", require: false
 
@@ -80,7 +80,7 @@ gem "sprockets",  "~> 3.7", ">= 3.7.2"
 gem "turbolinks", "~> 2.5", ">= 2.5.4"
 gem "typhoeus",   "~> 1.3"
 
-gem "uglifier",      "~> 3.2"
+gem "uglifier",      "~> 4.1"
 gem "unicode-emoji", "~> 1.1"
 
 group :development do
@@ -94,20 +94,20 @@ group :development, :test do
   gem "fuubar",                   "~> 2.4.0"
   gem "guard-rspec",              "~> 4.7", ">= 4.7.3", require: false
   gem "knapsack",                 "~> 1.14", ">= 1.14.1"
-  gem "rails-controller-testing", "~> 1.0", ">= 1.0.2"
+  gem "rails-controller-testing", "~> 1.0", ">= 1.0.4"
   gem "rspec-rails",              "~> 3.6", ">= 3.6.1"
   gem "rubocop",                  "~> 0.49.1", require: false
   gem "scss_lint",                "~> 0.54.0", require: false
-  gem "spring",                   "~> 2.0", ">= 2.0.2"
+  gem "spring",                   "~> 2.1", ">= 2.1.0"
   gem "spring-watcher-listen",    "~> 2.0", ">= 2.0.1"
   gem "terminal-notifier-guard",  "~> 1.7"
   gem "timecop",                  "~> 0.9.1"
 end
 
 group :production do
-  gem "dogstatsd-ruby",     "~> 3.0"
+  gem "dogstatsd-ruby",     "~> 4.5"
   gem "lograge",            "~> 0.11.2"
-  gem "newrelic_rpm",       "~> 4.4", ">= 4.4.0.336"
+  gem "newrelic_rpm",       "~> 6.5", ">= 6.5.0.357"
   gem "pinglish",           "~> 0.2.1"
   gem "puma_worker_killer", "~> 0.1.1"
   gem "rack-tracker",       "~> 1.11.1"
@@ -121,5 +121,5 @@ group :test do
   gem "shoulda-matchers",     "4.0.0.rc1"
   gem "simplecov",            "~> 0.15.0", require: false
   gem "vcr",                  "~> 3.0", ">= 3.0.3"
-  gem "webmock",              "~> 3.0", ">= 3.0.1"
+  gem "webmock",              "~> 3.5"
 end

Gemfile.lock

@@ -80,13 +80,13 @@ GEM
       statsd-ruby (~> 1.1)
     bindata (2.4.4)
     bindex (0.5.0)
-    bootsnap (1.1.2)
+    bootsnap (1.4.4)
       msgpack (~> 1.0)
     builder (3.2.3)
     bullet (6.0.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (9.1.0)
+    byebug (11.0.1)
     case_transform (0.2)
       activesupport
     coderay (1.1.2)
@@ -111,7 +111,7 @@ GEM
     declarative-option (0.1.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    dogstatsd-ruby (3.0.0)
+    dogstatsd-ruby (4.5.0)
     dotenv (2.7.4)
     dotenv-rails (2.7.4)
       dotenv (= 2.7.4)
@@ -194,7 +194,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (0.3.6)
+    hashdiff (1.0.0)
     hashie (3.6.0)
     httpclient (2.8.3)
     i18n (0.9.5)
@@ -259,12 +259,12 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    msgpack (1.1.0)
+    msgpack (1.3.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
-    newrelic_rpm (4.8.0.341)
+    newrelic_rpm (6.5.0.357)
     nio4r (2.4.0)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
@@ -278,10 +278,10 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octicons (2.1.0)
+    octicons (9.1.1)
       nokogiri (>= 1.6.3.1)
-    octicons_helper (2.1.0)
-      octicons (~> 2.0)
+    octicons_helper (9.1.1)
+      octicons (= 9.1.1)
       rails
     octopoller (0.1.0)
     omniauth (1.9.0)
@@ -333,10 +333,10 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.5.0)
-      byebug (~> 9.1)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    pry-rails (0.3.6)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (3.1.1)
     puma (4.0.1)
@@ -353,7 +353,7 @@ GEM
     rack-rewrite (1.5.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rack-timeout (0.4.2)
+    rack-timeout (0.5.1)
     rack-tracker (1.11.1)
       activesupport (>= 3.0)
       rack (>= 1.4)
@@ -371,18 +371,18 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.2.3)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.0.4)
-      i18n (~> 0.7)
-      railties (~> 5.0)
+    rails-i18n (5.1.3)
+      i18n (>= 0.7, < 2)
+      railties (>= 5.0, < 6)
     railties (5.2.3)
       actionpack (= 5.2.3)
       activesupport (= 5.2.3)
@@ -435,7 +435,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
     sass (3.4.25)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
@@ -469,8 +469,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (3.6.0)
-    spring (2.0.2)
-      activesupport (>= 4.2)
+    spring (2.1.0)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
@@ -494,7 +493,7 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
-    uglifier (3.2.0)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     unicode-emoji (1.1.0)
@@ -505,10 +504,10 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.0.1)
+    webmock (3.7.5)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
@@ -523,12 +522,12 @@ DEPENDENCIES
   autoprefixer-rails (~> 7.1, >= 7.1.3)
   awesome_print (~> 1.8)
   barnes
-  bootsnap (~> 1.1, >= 1.1.2)
+  bootsnap (~> 1.4, >= 1.4.4)
   bullet (~> 6.0.1)
   connection_pool (~> 2.2, >= 2.2.1)
   dalli (~> 2.7, >= 2.7.6)
   database_cleaner (~> 1.6, >= 1.6.1)
-  dogstatsd-ruby (~> 3.0)
+  dogstatsd-ruby (~> 4.5)
   dotenv-rails (~> 2.7.4)
   factory_bot_rails (~> 4.8)
   failbot_rails (~> 0.5.0)
@@ -554,9 +553,9 @@ DEPENDENCIES
   kramdown (~> 1.17.0)
   local_time (~> 2.0)
   lograge (~> 0.11.2)
-  newrelic_rpm (~> 4.4, >= 4.4.0.336)
+  newrelic_rpm (~> 6.5, >= 6.5.0.357)
   oauth (~> 0.5.4)
-  octicons_helper (~> 2.1)
+  octicons_helper (~> 9.1.1)
   octokit!
   octopoller (~> 0.1)
   omniauth-github (~> 1.3)
@@ -570,17 +569,17 @@ DEPENDENCIES
   pg (~> 1.1.4)
   pg_search (~> 2.2)
   pinglish (~> 0.2.1)
-  pry-byebug (~> 3.5)
-  pry-rails (~> 0.3.6)
+  pry-byebug (~> 3.7)
+  pry-rails (~> 0.3.9)
   puma (~> 4.0, >= 4.0.1)
   puma_worker_killer (~> 0.1.1)
   rack-canonical-host (~> 0.2.3)
   rack-rewrite (~> 1.5.0)
-  rack-timeout (~> 0.4.2)
+  rack-timeout (~> 0.5.1)
   rack-tracker (~> 1.11.1)
   rails (~> 5.2.3)
-  rails-controller-testing (~> 1.0, >= 1.0.2)
-  rails-i18n (~> 5.0, >= 5.0.1)
+  rails-controller-testing (~> 1.0, >= 1.0.4)
+  rails-i18n (~> 5.1, >= 5.1.3)
   redis-namespace (~> 1.5, >= 1.5.3)
   rspec-rails (~> 3.6, >= 3.6.1)
   rubocop (~> 0.49.1)
@@ -590,21 +589,21 @@ DEPENDENCIES
   shoulda-matchers (= 4.0.0.rc1)
   sidekiq (~> 5.2, >= 5.2.7)
   simplecov (~> 0.15.0)
-  spring (~> 2.0, >= 2.0.2)
+  spring (~> 2.1, >= 2.1.0)
   spring-watcher-listen (~> 2.0, >= 2.0.1)
   sprockets (~> 3.7, >= 3.7.2)
   terminal-notifier-guard (~> 1.7)
   timecop (~> 0.9.1)
   turbolinks (~> 2.5, >= 2.5.4)
   typhoeus (~> 1.3)
-  uglifier (~> 3.2)
+  uglifier (~> 4.1)
   unicode-emoji (~> 1.1)
   vcr (~> 3.0, >= 3.0.3)
   web-console (~> 3.5, >= 3.5.1)
-  webmock (~> 3.0, >= 3.0.1)
+  webmock (~> 3.5)
 
 RUBY VERSION
-   ruby 2.4.2p198
+   ruby 2.6.4p104
 
 BUNDLED WITH
    2.0.2