Merge remote-tracking branch 'upstream/dev' into url-health-checks

# Conflicts:
#	composer.lock

.gitignore

@@ -8,7 +8,9 @@
 /vendor
 .env
 .phpunit.result.cache
+composer.lock
 Homestead.json
 Homestead.yaml
 npm-debug.log
+package-lock.json
 yarn-error.log

changelog.md

@@ -1,3 +1,10 @@
+# Unreleased
+
+## Changed
+
+- Dependencies update
+- `composer.lock` and `package-lock.json` are no longer under git
+
 # 1.2.42
 
 ## Fixed

composer.json

@@ -30,15 +30,15 @@
         "guzzlehttp/guzzle": "^6.5",
         "hashids/hashids": "^2.0.4|~3.0",
         "lab404/laravel-auth-checker": "^1.4",
-        "laravel/framework": "^6.0",
+        "laravel/framework": "^6.18",
         "laravel/scout": "^7.1",
         "laravel/tinker": "^1.0",
         "maatwebsite/excel": "^3.1",
         "mews/captcha": "^3.0",
         "nesk/puphpeteer": "^1.6",
-        "norkunas/youtube-dl-php": "^1.3",
+        "norkunas/youtube-dl-php": "^1.6",
         "predis/predis": "^1.1",
-        "spatie/laravel-backup": "^6.7",
+        "spatie/laravel-backup": "^6.11",
         "spatie/laravel-medialibrary": "^7.0.0",
         "spatie/valuestore": "^1.2",
         "symfony/dom-crawler": "^4.3",