Release Candidate v2.1.2 (#855)

* Fixes #854 Error when creating new user
Fixed type error in the account controller
Turned off tls in the mail server settings to prevent ssl error
Updated the mail server image to point at the active repo

.env.example

@@ -31,7 +31,7 @@ MAIL_HOST=maildev
 MAIL_PORT=25
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
-MAIL_ENCRYPTION=tls
+MAIL_ENCRYPTION=null
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=

Makefile

@@ -28,6 +28,8 @@ setup: build
 # run the whole stack and open up the app in the browser
 run:
 	docker-compose up -d
+	docker-compose exec web sh -c 'wait-for-it db:3306 -t 180'
+	docker-compose exec web sh -c 'wait-for-it web:443 -t 120'
 	open https://localhost:8081/
 
 # open a bash prompt on a running web container

VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

app/Http/Controllers/ManageAccountController.php

@@ -11,7 +11,7 @@
 use App\Models\User;
 use Exception;
 use GuzzleHttp\Client;
-use Illuminate\Contracts\Mail\Mailable;
+use Illuminate\Mail\Message;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -200,7 +200,7 @@ public function postInviteUser(Request $request)
             'inviter'       => Auth::user(),
         ];
 
-        Mail::send('Emails.inviteUser', $data, static function (Mailable $message) use ($data) {
+        Mail::send('Emails.inviteUser', $data, static function (Message $message) use ($data) {
             $message->to($data['user']->email)
                 ->subject(trans('Email.invite_user', [
                     'name' => $data['inviter']->first_name . ' ' . $data['inviter']->last_name,

docker-compose.yml

@@ -41,7 +41,7 @@ services:
     volumes:
       - "mysql-data:/var/lib/mysql"
   maildev:
-    image: djfarrelly/maildev
+    image: maildev/maildev
     ports:
       - "1080:80"
   redis:

scripts/setup

@@ -8,4 +8,3 @@ chmod -R a+w .env
 chmod -R a+w storage/
 chmod -R a+w bootstrap/cache/
 php artisan key:generate
-php artisan migrate