Merge remote-tracking branch 'origin/develop'

Author: snipe

resources/lang/en-US/general.php

@@ -522,7 +522,7 @@
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',

tests/Feature/Authentication/LoginTest.php

@@ -62,6 +62,7 @@ public function testLoginThrottleConfigIsRespected()
 
     public function testLogsSuccessfulLogin()
     {
+        $this->markTestIncomplete("This test is flaky and needs to be fixed. Passes and fails seemingly at random.");
         User::factory()->create(['username' => 'username_here']);
 
         $this->withServerVariables(['REMOTE_ADDR' => '127.0.0.100'])