Merge pull request #8392 from snipe/integrations/rc5-4-2020-08-31-dev-into-master

Integrations/rc5 4 2020 08 31 dev into master

resources/views/layouts/default.blade.php

@@ -839,6 +839,10 @@
 
     {{-- Javascript files --}}
     <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
+
+    <!-- v5-beta: This pGenerator call must remain here for v5 - until fixed - so that the JS password generator works for the user create modal. -->
+    <script src="{{ url('js/pGenerator.jquery.js') }}"></script>
+
     {{-- Page level javascript --}}
     @stack('js')
 

resources/views/users/index.blade.php

@@ -45,7 +45,7 @@
                'class' => 'form-inline',
                 'id' => 'bulkForm']) }}
 
-            @if (Input::get('status')!='deleted')
+            @if (request('status')!='deleted')
               @can('delete', \App\Models\User::class)
                 <div id="toolbar">
                     <label for="bulk_actions" class="sr-only">Bulk Actions</label>

storage/framework/cache/data/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore