Merge branch 'release/1.3'

.env.example

@@ -45,10 +45,6 @@ ELASTICSEARCH_HOST='localhost'
 ELASTICSEARCH_PORT=9200
 ELASTICSEARCH_SCHEME='http'
 
-ELASTICSEARCH_CACHE_ENABLED=false
-ELASTICSEARCH_CACHE_TTL=1800 # 30 min
-ELASTICSEARCH_CACHE_VERSION='v1'
-
 # https://aws.amazon.com/blogs/database/get-started-with-amazon-elasticsearch-service-how-many-shards-do-i-need/
 ELASTICSEARCH_SHARDS_PRIMARY=1 # Increase if average index size is greater than 30 GB
 ELASTICSEARCH_SHARDS_REPLICA=0 # Set to number of nodes - 1

.gitignore

@@ -1,25 +1,36 @@
+# Laravel 8.x Defaults
 /node_modules
 /public/hot
 /public/storage
 /storage/*.key
 /vendor
-/.idea
-/.vagrant
+.env
+.env.backup
+.phpunit.result.cache
+docker-compose.override.yml
 Homestead.json
 Homestead.yaml
 npm-debug.log
-.env*
-!.env.*example
-!.env.ci
-Envoy.blade.php
-.phpunit.result.cache
-docker-compose.override.yml
+yarn-error.log
+/.idea
+/.vscode
+
+# Foundation workflow [API-118]
+composer-dev.json
+composer-dev.lock
+
+# PHP-CS-Fixer [API-45]
 .php_cs.cache
-.php_cs
+.php-cs-fixer.cache
 
+# Custom additions
 /public/js
 /public/css
-
+/public/docs
+/.vagrant
+.env*
+!.env.*example
+!.env.ci
 pids
 logs
 coverage/
@@ -30,6 +41,3 @@ dist
 .basement
 config.local.js
 basement_dist
-/public/docs
-/.idea
-/.vscode