Merge branch 'master' into snyk-fix-4e67c2a08d3c33dc61da81f0c8650f31

Gemfile

@@ -57,7 +57,7 @@ gem 'activerecord-session_store'
 
 # frontend
 gem 'bootstrap', '~> 4.3.1'
-gem 'font-awesome-sass', '~> 5.9.0'
+gem 'font-awesome-sass', '~> 6.4.0'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
@@ -71,8 +71,8 @@ group :development, :test do
 end
 
 group :development do
-  gem 'rubocop', '~> 1.26', require: false
-  gem 'rubocop-rails', '~> 2.17', '>= 2.17.4', require: false
+  gem 'rubocop', '~> 1.54', require: false
+  gem 'rubocop-rails', '~> 2.20', '>= 2.20.2', require: false
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'listen', '~> 3.0.5'
   gem 'web-console', '>= 4.2.0'
@@ -87,7 +87,7 @@ group :test do
 end
 
 group :production do
-  gem 'lograge', '~> 0.11.2'
+  gem 'lograge', '~> 0.12.0'
   gem 'remote_syslog_logger'
 end
 

Gemfile.lock

@@ -173,8 +173,8 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    font-awesome-sass (5.9.0)
-      sassc (>= 1.11)
+    font-awesome-sass (6.4.0)
+      sassc (~> 2.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
@@ -203,6 +203,7 @@ GEM
       bindata
       httpclient
     jwt (2.2.3)
+    language_server-protocol (3.17.0.3)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -211,7 +212,7 @@ GEM
       rake (~> 13.0)
     lodash-rails (4.17.21)
       railties (>= 3.1)
-    lograge (0.11.2)
+    lograge (0.12.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
@@ -254,8 +255,9 @@ GEM
       json
       rack (>= 1.4, < 4.0)
     parallel (1.23.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     pg (1.4.5)
     popper_js (1.16.1)
     psych (5.1.0)
@@ -308,7 +310,7 @@ GEM
       railties (>= 3.2)
       tilt
     redis (4.8.1)
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     remote_syslog_logger (1.0.4)
       syslog_protocol
     repost (0.3.8)
@@ -336,19 +338,20 @@ GEM
       rspec-mocks (~> 3.11)
       rspec-support (~> 3.11)
     rspec-support (3.12.0)
-    rubocop (1.50.2)
+    rubocop (1.55.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.19.1)
+    rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -432,15 +435,15 @@ DEPENDENCIES
   doorkeeper (~> 5.4.0)
   dotenv-rails
   faraday
-  font-awesome-sass (~> 5.9.0)
+  font-awesome-sass (~> 6.4.0)
   http
   ims-lti!
   jbuilder (~> 2.11, >= 2.11.5)
   jquery-rails (>= 4.6.0)
   jwt (~> 2.2.2)
   listen (~> 3.0.5)
   lodash-rails
-  lograge (~> 0.11.2)
+  lograge (~> 0.12.0)
   minitest-stub_any_instance
   oauth (~> 0.5.1)
   oauthenticator (~> 1.4, >= 1.4.1)
@@ -455,8 +458,8 @@ DEPENDENCIES
   repost (~> 0.3.8)
   rspec
   rspec-rails
-  rubocop (~> 1.26)
-  rubocop-rails (~> 2.17, >= 2.17.4)
+  rubocop (~> 1.54)
+  rubocop-rails (~> 2.20, >= 2.20.2)
   sass-rails (>= 6.0.0)
   simple_oauth!
   spring

lib/tasks/db_keys.rake

@@ -134,7 +134,6 @@ namespace :db do
       url += "#{url_root}/#{tool_name}/messages/blti"
 
       puts("Key:\t#{tool.uuid}\nSecret:\t#{tool.shared_secret}\nURL:\t#{url}")
-
     rescue StandardError => e
       puts(e.backtrace)
       exit(1)