Merge branch 'auth' of git://github.com/benrubson/BookStack into benrubson-auth

diff --cc .env.example.complete
Simple merge

diff --cc app/Actions/ActivityService.php
Simple merge

diff --cc app/Config/logging.php
index 375e84083f9cb647468521cb2a850397684b645e,406b9f2f938892322aa74492d3a4bebc3ee021fc..ba77ba81e87ac5d6b1daf8bdecfc4f38a6207117
--- 1/app/Config/logging.php
--- 2/app/Config/logging.php
+++ b/app/Config/logging.php
@@@ -77,13 -77,11 +77,18 @@@ return 
              'driver' => 'monolog',
              'handler' => NullHandler::class,
          ],
 +
 +        // Testing channel
 +        // Uses a shared testing instance during tests
 +        // so that logs can be checked against.
 +        'testing' => [
 +            'driver' => 'testing',
 +        ],
      ],
  
+     // Failed Access Message
+     // Defines the message to log into webserver logs in case of failed access,
+     // for further processing by tools like Fail2Ban.
+     'failed_access_message' => env('FAILED_ACCESS_MESSAGE', ''),
+ 
  ];

diff --cc app/Http/Controllers/Auth/LoginController.php
Simple merge