Merge branch 'master' into dependabot/add-v2-config-file

Author: musaprg

Gemfile

@@ -48,7 +48,7 @@ group :development, :test do
 end
 
 group :development do
-  gem 'listen', '~> 3.2.1'
+  gem 'listen', '~> 3.5.1'
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring

Gemfile.lock

@@ -132,7 +132,7 @@ GEM
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
-    listen (3.2.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.9.1)
@@ -297,7 +297,7 @@ DEPENDENCIES
   jquery-rails
   kaminari
   letter_opener_web
-  listen (~> 3.2.1)
+  listen (~> 3.5.1)
   pg (= 1.2.3)
   pry-byebug
   puma (~> 4.3)

package.json

@@ -55,7 +55,7 @@
     "@types/react-dom": "^16.9.12",
     "@types/react-router": "^4.4.5",
     "@types/react-router-dom": "^5.1.7",
-    "husky": "^4.3.8",
+    "husky": "^6.0.0",
     "lint-staged": "^11.0.0",
     "prettier": "^2.2.1",
     "ts-loader": "^8.2.0",