Issue upgrading from 4.8.0 to 4.9.2

Expected Behavior (or desired behavior if a feature request)

Trying to upgrade my snipe-it using `php upgrade.php`

Actual Behavior

First it failed with an error error: The following untracked working tree files would be overwritten by merge: with most of the CSS skins listed. If I manually deleted them, then the upgrade worked, including replacing the css files and it deciding to update composer dependencies. However, if I then run the upgrade again, instead of telling me it's up to date, it rolls everything back.

Here is a copy of my console:

Click to expand

``` pete@snipe-it:~$ cd /var/www/snipe-it/ pete@snipe-it:/var/www/snipe-it$ php upgrade.php Welcome to the Snipe-IT upgrader. Please note that this script will not download the latest Snipe-IT files for you unless you have git installed. It simply runs the standard composer and artisan commands needed to finalize the upgrade after. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! If you have any encrypted custom fields, BE SURE TO run the recrypter if upgrading from v3 to v4. !! See the Snipe-IT documentation for help: !! https://snipe-it.readme.io/docs/upgrading-to-v4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -------------------------------------------------------- STEP 1: Backing up database: -------------------------------------------------------- -- Starting backup... Dumping database snipeit_data... Determining files to backup... Zipping 611 files... Created zip containing 611 files. Size is 15.71 MB Copying zip to disk named local... Successfully copied zip to disk named local. Backup completed! -------------------------------------------------------- STEP 2: Putting application into maintenance mode: -------------------------------------------------------- -- Application is now in maintenance mode. -------------------------------------------------------- STEP 3: Pulling latest from Git (master branch): -------------------------------------------------------- Git is installed. remote: Enumerating objects: 66, done. remote: Counting objects: 100% (66/66), done. remote: Compressing objects: 100% (27/27), done. remote: Total 66 (delta 41), reused 60 (delta 37), pack-reused 0 Unpacking objects: 100% (66/66), done. From https://github.com/snipe/snipe-it f88683766..001e72153 master -> origin/master 8cc9e6198..3db4480bb develop -> origin/develop 49b360fe4..b8d9a208e dusk -> origin/dusk Already on 'master' error: The following untracked working tree files would be overwritten by merge: public/css/skins/skin-black-dark.css public/css/skins/skin-black-dark.css.map public/css/skins/skin-black-light.css public/css/skins/skin-black-light.css.map public/css/skins/skin-black.css public/css/skins/skin-black.css.map public/css/skins/skin-blue-dark.css public/css/skins/skin-blue-dark.css.map public/css/skins/skin-blue-light.css.map public/css/skins/skin-blue.css.map public/css/skins/skin-contrast.css public/css/skins/skin-contrast.css.map public/css/skins/skin-green-dark.css.map public/css/skins/skin-green-light.css public/css/skins/skin-green-light.css.map public/css/skins/skin-green.css public/css/skins/skin-green.css.map public/css/skins/skin-orange-dark.css.map public/css/skins/skin-orange-light.css public/css/skins/skin-orange-light.css.map public/css/skins/skin-orange.css public/css/skins/skin-orange.css.map public/css/skins/skin-purple-dark.css public/css/skins/skin-purple-dark.css.map public/css/skins/skin-purple-light.css public/css/skins/skin-purple-light.css.map public/css/skins/skin-purple.css public/css/skins/skin-purple.css.map public/css/skins/skin-red-dark.css.map public/css/skins/skin-red-light.css public/css/skins/skin-red-light.css.map public/css/skins/skin-red.css public/css/skins/skin-red.css.map public/css/skins/skin-yellow-dark.css public/css/skins/skin-yellow-dark.css.map public/css/skins/skin-yellow-light.css public/css/skins/skin-yellow-light.css.map public/css/skins/skin-yellow.css public/css/skins/skin-yellow.css.map resources/assets/less/skins/skin-black-dark.less resources/assets/less/skins/skin-blue-dark.less resources/assets/less/skins/skin-contrast.less resources/assets/less/skins/skin-green-dark.less resources/assets/less/skins/skin-orange-dark.less resources/assets/less/skins/skin-orange.less resources/assets/less/skins/skin-purple-dark.less resources/assets/less/skins/skin-red-dark.less resources/assets/less/skins/skin-yellow-dark.less Please move or remove them before you merge. Aborting -- -- No local changes to save -- Your branch is behind 'origin/master' by 192 commits, and can be fast-forwarded. (use "git pull" to update your local branch) -- Updating ca1285ec0..001e72153 -------------------------------------------------------- Step 4: Cleaning up old cached files: -------------------------------------------------------- -- No bootstrap/cache/compiled.php, so nothing to delete. -- Deleting bootstrap/cache/services.php. It it no longer used. -- Deleting bootstrap/cache/config.php. It it no longer used. -- Configuration cache cleared! -- Cache cleared successfully. -- Route cache cleared! -- Compiled views cleared! -------------------------------------------------------- Step 5: Updating composer dependencies: (This may take an moment.) -------------------------------------------------------- -- We couldn't find a local composer.phar - trying globally. Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover Loading composer repositories with package information Installing dependencies from lock file Nothing to install or update Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover Carbon 1 is deprecated, see how to migrate to Carbon 2. https://carbon.nesbot.com/docs/#api-carbon-2 You can run './vendor/bin/upgrade-carbon' to get help in updating carbon and other frameworks and libraries that depend on it. Discovered Package: barryvdh/laravel-cors Discovered Package: barryvdh/laravel-debugbar Discovered Package: eduardokum/laravel-mail-auto-embed Discovered Package: fideloper/proxy Discovered Package: intervention/image Discovered Package: laravel/passport Discovered Package: laravel/tinker Discovered Package: laravelcollective/html Discovered Package: nesbot/carbon Discovered Package: pragmarx/google2fa-laravel Discovered Package: rollbar/rollbar-laravel Discovered Package: schuppo/password-strength Discovered Package: spatie/laravel-backup Discovered Package: tightenco/ziggy Discovered Package: unicodeveloper/laravel-password Package manifest generated successfully. Carbon 1 is deprecated, see how to migrate to Carbon 2. https://carbon.nesbot.com/docs/#api-carbon-2 You can run './vendor/bin/upgrade-carbon' to get help in updating carbon and other frameworks and libraries that depend on it. Discovered Package: barryvdh/laravel-cors Discovered Package: barryvdh/laravel-debugbar Discovered Package: eduardokum/laravel-mail-auto-embed Discovered Package: fideloper/proxy Discovered Package: intervention/image Discovered Package: laravel/passport Discovered Package: laravel/tinker Discovered Package: laravelcollective/html Discovered Package: nesbot/carbon Discovered Package: pragmarx/google2fa-laravel Discovered Package: rollbar/rollbar-laravel Discovered Package: schuppo/password-strength Discovered Package: spatie/laravel-backup Discovered Package: tightenco/ziggy Discovered Package: unicodeveloper/laravel-password Package manifest generated successfully. -------------------------------------------------------- Step 6: Migrating database: -------------------------------------------------------- -- Nothing to migrate. -------------------------------------------------------- Step 7: Checking for OAuth keys: -------------------------------------------------------- - OAuth keys detected. Skipping passport install. -------------------------------------------------------- Step 8: Caching routes and config: -------------------------------------------------------- -- Configuration cache cleared! Configuration cached successfully! -- Route cache cleared! Routes cached successfully! -------------------------------------------------------- Step 9: Taking application out of maintenance mode: -------------------------------------------------------- -- Application is now live. -------------------------------------------------------- FINISHED! Clear your browser cookies and re-login to use : your upgraded Snipe-IT. -------------------------------------------------------- pete@snipe-it:/var/www/snipe-it$ ``` ``` pete@snipe-it:/var/www/snipe-it$ cd public/css/skins/ pete@snipe-it:/var/www/snipe-it/public/css/skins$ rm * pete@snipe-it:/var/www/snipe-it$ cd /var/www/snipe-it/resources/assets/less/skins pete@snipe-it:/var/www/snipe-it/resources/assets/less/skins$ rm * pete@snipe-it:/var/www/snipe-it/resources/assets$ cd /var/www/snipe-it pete@snipe-it:/var/www/snipe-it$ php upgrade.php Welcome to the Snipe-IT upgrader. Please note that this script will not download the latest Snipe-IT files for you unless you have git installed. It simply runs the standard composer and artisan commands needed to finalize the upgrade after. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! If you have any encrypted custom fields, BE SURE TO run the recrypter if upgrading from v3 to v4. !! See the Snipe-IT documentation for help: !! https://snipe-it.readme.io/docs/upgrading-to-v4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -------------------------------------------------------- STEP 1: Backing up database: -------------------------------------------------------- -- Starting backup... Dumping database snipeit_data... Determining files to backup... Zipping 611 files... Created zip containing 611 files. Size is 15.71 MB Copying zip to disk named local... Successfully copied zip to disk named local. Backup completed! -------------------------------------------------------- STEP 2: Putting application into maintenance mode: -------------------------------------------------------- -- Application is now in maintenance mode. -------------------------------------------------------- STEP 3: Pulling latest from Git (master branch): -------------------------------------------------------- Git is installed. Already on 'master' error: unable to create file public/uploads/barcodes/invalid_barcode.gif: Permission denied -- -- Saved working directory and index state WIP on master: ca1285ec0 Updated favicon -- D public/css/skins/_all-skins.css D public/css/skins/_all-skins.min.css D public/css/skins/skin-blue-light.css D public/css/skins/skin-blue-light.min.css D public/css/skins/skin-blue.css D public/css/skins/skin-green-dark.css D public/css/skins/skin-orange-dark.css D public/css/skins/skin-red-dark.css D resources/assets/less/skins/_all-skins.less D resources/assets/less/skins/skin-black-light.less D resources/assets/less/skins/skin-black.less D resources/assets/less/skins/skin-blue-light.less D resources/assets/less/skins/skin-blue.less D resources/assets/less/skins/skin-green-light.less D resources/assets/less/skins/skin-green.less D resources/assets/less/skins/skin-purple-light.less D resources/assets/less/skins/skin-purple.less D resources/assets/less/skins/skin-red-light.less D resources/assets/less/skins/skin-red.less D resources/assets/less/skins/skin-yellow-light.less D resources/assets/less/skins/skin-yellow.less Your branch is behind 'origin/master' by 192 commits, and can be fast-forwarded. (use "git pull" to update your local branch) -- Updating ca1285ec0..001e72153 -------------------------------------------------------- Step 4: Cleaning up old cached files: -------------------------------------------------------- -- No bootstrap/cache/compiled.php, so nothing to delete. -- Deleting bootstrap/cache/services.php. It it no longer used. -- Deleting bootstrap/cache/config.php. It it no longer used. -- Configuration cache cleared! -- Cache cleared successfully. -- Route cache cleared! -- Compiled views cleared! -------------------------------------------------------- Step 5: Updating composer dependencies: (This may take an moment.) -------------------------------------------------------- -- We couldn't find a local composer.phar - trying globally. Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover Loading composer repositories with package information Installing dependencies from lock file Package operations: 3 installs, 54 updates, 1 removal - Removing maknz/slack (1.7.0) - Updating kylekatarnls/update-helper (1.2.0 => 1.2.1): Checking out 429be50660 - Updating symfony/polyfill-util (v1.13.1 => v1.16.0): Checking out fa1fdaf94e - Updating symfony/polyfill-php56 (v1.13.1 => v1.16.0): Checking out 14b55b0e88 - Updating symfony/polyfill-ctype (v1.13.1 => v1.16.0): Checking out 1aab00e39c - Updating symfony/polyfill-php70 (v1.13.1 => v1.16.0): Checking out 6cc55bd2a0 - Updating symfony/polyfill-mbstring (v1.13.1 => v1.16.0): Checking out a54881ec0a - Updating symfony/http-foundation (v3.4.36 => v3.4.40): Checking out eded33daef - Updating symfony/event-dispatcher (v3.4.36 => v3.4.40): Checking out 9d4e22943b - Updating psr/log (1.1.2 => 1.1.3): Checking out 0f73288fd1 - Updating symfony/debug (v3.4.36 => v3.4.40): Checking out ce9f3b5e8e - Updating symfony/http-kernel (v3.4.36 => v3.4.40): Checking out 139d477cc9 - Updating asm89/stack-cors (1.2.0 => 1.3.0): Checking out b9c31def6a - Updating symfony/finder (v3.4.36 => v3.4.40): Checking out 5ec813ccaf - Updating symfony/var-dumper (v3.4.36 => v3.4.40): Checking out 13c03169ae - Updating maximebf/debugbar (v1.15.1 => v1.16.3): Checking out 1a1605b8e9 - Updating vlucas/phpdotenv (v2.6.1 => v2.6.4): Checking out 67d472b179 - Updating symfony/routing (v3.4.36 => v3.4.40): Checking out 53b432fde8 - Updating symfony/process (v3.4.36 => v3.4.40): Checking out f5104c9dcb - Updating symfony/console (v3.4.36 => v3.4.40): Checking out bf60d5e606 - Updating symfony/polyfill-php72 (v1.13.1 => v1.16.0): Checking out 42fda6d738 - Updating symfony/polyfill-intl-idn (v1.13.1 => v1.16.0): Checking out ab0af41dea - Updating symfony/polyfill-iconv (v1.13.1 => v1.16.0): Checking out d51debc139 - Updating egulias/email-validator (2.1.11 => 2.1.17): Checking out ade6887fd9 - Updating ramsey/uuid (3.9.1 => 3.9.3): Checking out 7e1633a696 - Updating symfony/translation (v3.4.36 => v3.4.40): Checking out 4e844362f5 - Updating mtdowling/cron-expression (v1.2.1 => v1.2.3): Checking out 9be552eebc - Updating monolog/monolog (1.25.2 => 1.25.3): Checking out fa82921994 - Updating league/flysystem (1.0.57 => 1.0.67): Checking out 5b1f36c75c - Updating erusev/parsedown (1.7.3 => 1.7.4): Checking out cb17b6477d - Updating laravel/framework (v5.5.48 => v5.5.49): Checking out a81f23d0cc - Updating barryvdh/laravel-debugbar (v3.2.8 => v3.3.3): Checking out 57f2219f6d - Updating doctrine/annotations (v1.8.0 => 1.10.2): Checking out b9d758e831 - Updating doctrine/reflection (v1.0.0 => 1.2.1): Checking out 55e71912df - Updating doctrine/persistence (1.2.0 => 1.3.7): Checking out 0af483f91b - Updating doctrine/common (v2.11.0 => 2.12.0): Checking out 2053eafdf6 - Installing squizlabs/php_codesniffer (3.5.5): Cloning 73e2e7f57d from cache - Installing masterminds/html5 (2.7.0): Cloning 104443ad66 from cache - Updating eduardokum/laravel-mail-auto-embed (1.0.4 => 1.0.5): Checking out 83349a6a35 - Updating enshrined/svg-sanitize (0.13.0 => 0.13.3): Checking out bc66593f25 - Updating fideloper/proxy (4.2.1 => 4.3.0): Checking out ec38ad69ee - Updating firebase/php-jwt (v5.0.0 => v5.2.0): Checking out feb0e820b8 - Updating league/csv (9.4.1 => 9.5.0): Checking out b348d09d0d - Updating neitanod/forceutf8 (v2.0.2 => v2.0.4): Checking out c1fbe70bfb - Updating phpdocumentor/reflection-common (2.0.0 => 2.1.0): Checking out 6568f4687e - Updating phpseclib/phpseclib (2.0.23 => 2.0.27): Checking out 34620af4df - Updating webmozart/assert (1.6.0 => 1.8.0): Checking out ab2cb0b3b5 - Updating phpdocumentor/reflection-docblock (4.3.2 => 4.3.4): Checking out da3fd972d6 - Updating phpspec/prophecy (1.9.0 => v1.10.3): Checking out 451c3cd141 - Updating pragmarx/google2fa-laravel (v1.3.0 => v1.3.3): Checking out ed6e0a9ea1 - Updating nikic/php-parser (v4.3.0 => v4.4.0): Checking out bd43ec7152 - Removing dnoegel/php-xdg-base-dir (0.1) - Installing dnoegel/php-xdg-base-dir (v0.1.1): Cloning 8f8a6e48c5 from cache - Updating psy/psysh (v0.9.11 => v0.9.12): Checking out 90da7f3756 - Updating schuppo/password-strength (v1.11 => v1.13): Checking out b1deef216f - Updating tecnickcom/tc-lib-color (1.12.13 => 1.12.15): Checking out 2f4860cbac - Updating tecnickcom/tc-lib-barcode (1.15.16 => 1.15.20): Checking out dd8de5620e - Updating guzzlehttp/guzzle (6.4.1 => 6.5.3): Checking out aab4ebd862 - Installing alek13/slack (1.11.0): Cloning 3198693196 from cache Package mtdowling/cron-expression is abandoned, you should avoid using it. Use dragonmantank/cron-expression instead. Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover Carbon 1 is deprecated, see how to migrate to Carbon 2. https://carbon.nesbot.com/docs/#api-carbon-2 You can run './vendor/bin/upgrade-carbon' to get help in updating carbon and other frameworks and libraries that depend on it. Discovered Package: barryvdh/laravel-cors Discovered Package: barryvdh/laravel-debugbar Discovered Package: eduardokum/laravel-mail-auto-embed Discovered Package: fideloper/proxy Discovered Package: intervention/image Discovered Package: laravel/passport Discovered Package: laravel/tinker Discovered Package: laravelcollective/html Discovered Package: nesbot/carbon Discovered Package: pragmarx/google2fa-laravel Discovered Package: rollbar/rollbar-laravel Discovered Package: schuppo/password-strength Discovered Package: spatie/laravel-backup Discovered Package: tightenco/ziggy Discovered Package: unicodeveloper/laravel-password Package manifest generated successfully. Carbon 1 is deprecated, see how to migrate to Carbon 2. https://carbon.nesbot.com/docs/#api-carbon-2 You can run './vendor/bin/upgrade-carbon' to get help in updating carbon and other frameworks and libraries that depend on it. Discovered Package: barryvdh/laravel-cors Discovered Package: barryvdh/laravel-debugbar Discovered Package: eduardokum/laravel-mail-auto-embed Discovered Package: fideloper/proxy Discovered Package: intervention/image Discovered Package: laravel/passport Discovered Package: laravel/tinker Discovered Package: laravelcollective/html Discovered Package: nesbot/carbon Discovered Package: pragmarx/google2fa-laravel Discovered Package: rollbar/rollbar-laravel Discovered Package: schuppo/password-strength Discovered Package: spatie/laravel-backup Discovered Package: tightenco/ziggy Discovered Package: unicodeveloper/laravel-password Package manifest generated successfully. -------------------------------------------------------- Step 6: Migrating database: -------------------------------------------------------- -- Nothing to migrate. -------------------------------------------------------- Step 7: Checking for OAuth keys: -------------------------------------------------------- - OAuth keys detected. Skipping passport install. -------------------------------------------------------- Step 8: Caching routes and config: -------------------------------------------------------- -- Configuration cache cleared! Configuration cached successfully! -- Route cache cleared! Routes cached successfully! -------------------------------------------------------- Step 9: Taking application out of maintenance mode: -------------------------------------------------------- -- Application is now live. -------------------------------------------------------- FINISHED! Clear your browser cookies and re-login to use : your upgraded Snipe-IT. -------------------------------------------------------- pete@snipe-it:/var/www/snipe-it$ ``` ``` pete@snipe-it:/var/www/snipe-it$ php upgrade.php Welcome to the Snipe-IT upgrader. Please note that this script will not download the latest Snipe-IT files for you unless you have git installed. It simply runs the standard composer and artisan commands needed to finalize the upgrade after. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! If you have any encrypted custom fields, BE SURE TO run the recrypter if upgrading from v3 to v4. !! See the Snipe-IT documentation for help: !! https://snipe-it.readme.io/docs/upgrading-to-v4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -------------------------------------------------------- STEP 1: Backing up database: -------------------------------------------------------- -- Starting backup... Dumping database snipeit_data... Determining files to backup... Zipping 611 files... Created zip containing 611 files. Size is 15.71 MB Copying zip to disk named local... Successfully copied zip to disk named local. Backup completed! -------------------------------------------------------- STEP 2: Putting application into maintenance mode: -------------------------------------------------------- -- Application is now in maintenance mode. -------------------------------------------------------- STEP 3: Pulling latest from Git (master branch): -------------------------------------------------------- Git is installed. Already on 'master' error: The following untracked working tree files would be overwritten by merge: public/css/skins/skin-black-dark.css public/css/skins/skin-black-dark.css.map public/css/skins/skin-black-light.css public/css/skins/skin-black-light.css.map public/css/skins/skin-black.css public/css/skins/skin-black.css.map public/css/skins/skin-blue-dark.css public/css/skins/skin-blue-dark.css.map public/css/skins/skin-blue-light.css.map public/css/skins/skin-blue.css.map public/css/skins/skin-contrast.css public/css/skins/skin-contrast.css.map public/css/skins/skin-green-dark.css.map public/css/skins/skin-green-light.css public/css/skins/skin-green-light.css.map public/css/skins/skin-green.css public/css/skins/skin-green.css.map public/css/skins/skin-orange-dark.css.map public/css/skins/skin-orange-light.css public/css/skins/skin-orange-light.css.map public/css/skins/skin-orange.css public/css/skins/skin-orange.css.map public/css/skins/skin-purple-dark.css public/css/skins/skin-purple-dark.css.map public/css/skins/skin-purple-light.css public/css/skins/skin-purple-light.css.map public/css/skins/skin-purple.css public/css/skins/skin-purple.css.map public/css/skins/skin-red-dark.css.map public/css/skins/skin-red-light.css public/css/skins/skin-red-light.css.map public/css/skins/skin-red.css public/css/skins/skin-red.css.map public/css/skins/skin-yellow-dark.css public/css/skins/skin-yellow-dark.css.map public/css/skins/skin-yellow-light.css public/css/skins/skin-yellow-light.css.map public/css/skins/skin-yellow.css public/css/skins/skin-yellow.css.map resources/assets/less/skins/skin-black-dark.less resources/assets/less/skins/skin-blue-dark.less resources/assets/less/skins/skin-contrast.less resources/assets/less/skins/skin-green-dark.less resources/assets/less/skins/skin-orange-dark.less resources/assets/less/skins/skin-orange.less resources/assets/less/skins/skin-purple-dark.less resources/assets/less/skins/skin-red-dark.less resources/assets/less/skins/skin-yellow-dark.less Please move or remove them before you merge. Aborting -- -- Saved working directory and index state WIP on master: ca1285ec0 Updated favicon -- M .all-contributorsrc M .env.example M README.md M app/Http/Controllers/AccessoriesController.php M app/Http/Controllers/Api/AccessoriesController.php M app/Http/Controllers/Api/AssetMaintenancesController.php M app/Http/Controllers/Api/AssetModelsController.php M app/Http/Controllers/Api/AssetsController.php M app/Http/Controllers/Api/CategoriesController.php M app/Http/Controllers/Api/CompaniesController.php M app/Http/Controllers/Api/ComponentsController.php M app/Http/Controllers/Api/ConsumablesController.php M app/Http/Controllers/Api/DepartmentsController.php M app/Http/Controllers/Api/DepreciationsController.php M app/Http/Controllers/Api/GroupsController.php M app/Http/Controllers/Api/ImportController.php M app/Http/Controllers/Api/LicensesController.php M app/Http/Controllers/Api/LocationsController.php M app/Http/Controllers/Api/ManufacturersController.php M app/Http/Controllers/Api/SettingsController.php M app/Http/Controllers/Api/StatuslabelsController.php M app/Http/Controllers/Api/SuppliersController.php M app/Http/Controllers/Api/UsersController.php M app/Http/Controllers/AssetModelsController.php M app/Http/Controllers/AssetsController.php M app/Http/Controllers/Auth/ForgotPasswordController.php M app/Http/Controllers/Auth/LoginController.php M app/Http/Controllers/CategoriesController.php M app/Http/Controllers/ComponentsController.php M app/Http/Controllers/CustomFieldsetsController.php M app/Http/Controllers/DepartmentsController.php M app/Http/Controllers/LicensesController.php M app/Http/Controllers/LocationsController.php M app/Http/Controllers/ManufacturersController.php M app/Http/Controllers/SettingsController.php M app/Http/Controllers/StatuslabelsController.php M app/Http/Controllers/SuppliersController.php M app/Http/Controllers/UsersController.php M app/Http/Middleware/ContentSecurityPolicyHeader.php M app/Http/Requests/AssetRequest.php M app/Http/Transformers/ActionlogsTransformer.php M app/Importer/AssetImporter.php M app/Importer/Importer.php M app/Models/Asset.php M app/Models/Loggable.php M app/Models/Setting.php M app/Presenters/AssetModelPresenter.php M app/Presenters/AssetPresenter.php M app/Presenters/CompanyPresenter.php M app/Presenters/LocationPresenter.php M app/Presenters/UserPresenter.php M composer.json M composer.lock M config/database.php M config/version.php M docker/startup.sh M npm-shrinkwrap.json M package.json M public/assets/css/themes/dark-green.css M public/css/AdminLTE.css M public/css/AdminLTE.css.map M public/css/build/all.css M public/css/dist/all.css M public/css/overrides.css M public/css/overrides.css.map M public/css/skins/skin-blue-light.css M public/css/skins/skin-blue.css M public/css/skins/skin-green-dark.css M public/css/skins/skin-orange-dark.css M public/css/skins/skin-red-dark.css M public/js/app.js M public/js/bootstrap-table.js M public/js/bootstrap/js/bootstrap.js M public/js/bootstrap/js/bootstrap.min.js M public/js/build/all.js M public/js/build/vue.js M public/js/build/vue.js.map M public/js/demo.js M public/js/dist/all.js M public/js/ekko-lightbox.js M public/js/ekko-lightbox.min.js M public/js/extensions/export/bootstrap-table-export.js M public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js M public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js M public/js/extensions/toolbar/bootstrap-table-toolbar.js M public/js/extensions/toolbar/bootstrap-table-toolbar.min.js M public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js M public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js M public/js/plugins/timepicker/bootstrap-timepicker.js M public/js/plugins/timepicker/bootstrap-timepicker.min.js M public/js/vue.js M public/mix-manifest.json M resources/assets/js/bootstrap-js.js M resources/assets/js/bootstrap.min.js M resources/assets/js/components/alert.vue M resources/assets/js/components/importer/importer-file.vue M resources/assets/js/components/passport/AuthorizedClients.vue M resources/assets/js/components/passport/Clients.vue M resources/assets/js/components/passport/PersonalAccessTokens.vue M resources/assets/js/ekko-lightbox.js M resources/assets/js/ekko-lightbox.min.js M resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js M resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js M resources/assets/js/plugins/chartjs/Chart.js M resources/assets/js/plugins/timepicker/bootstrap-timepicker.js M resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js M resources/assets/js/snipeit.js M resources/assets/js/snipeit_modals.js M resources/assets/less/AdminLTE.less M resources/assets/less/overrides.less M resources/assets/less/skins/_all-skins.less D resources/assets/less/skins/skin-black-light.less M resources/assets/less/skins/skin-black.less D resources/assets/less/skins/skin-blue-light.less M resources/assets/less/skins/skin-blue.less D resources/assets/less/skins/skin-green-light.less M resources/assets/less/skins/skin-green.less D resources/assets/less/skins/skin-purple-light.less M resources/assets/less/skins/skin-purple.less D resources/assets/less/skins/skin-red-light.less M resources/assets/less/skins/skin-red.less D resources/assets/less/skins/skin-yellow-light.less M resources/assets/less/skins/skin-yellow.less M resources/assets/less/variables.less M resources/lang/en/admin/users/message.php M resources/lang/en/auth/message.php M resources/lang/en/passwords.php M resources/macros/macros.php M resources/views/accessories/checkin.blade.php M resources/views/accessories/checkout.blade.php M resources/views/accessories/edit.blade.php M resources/views/accessories/view.blade.php M resources/views/account/accept-asset.blade.php M resources/views/account/change-password.blade.php M resources/views/account/profile.blade.php M resources/views/account/requestable-assets.blade.php M resources/views/account/view-assets.blade.php M resources/views/asset_maintenances/edit.blade.php M resources/views/asset_maintenances/view.blade.php M resources/views/auth/login.blade.php M resources/views/auth/passwords/email.blade.php M resources/views/auth/passwords/reset.blade.php M resources/views/auth/two_factor.blade.php M resources/views/auth/two_factor_enroll.blade.php M resources/views/categories/edit.blade.php M resources/views/companies/edit.blade.php M resources/views/companies/index.blade.php M resources/views/companies/view.blade.php M resources/views/components/checkin.blade.php M resources/views/components/checkout.blade.php M resources/views/components/edit.blade.php M resources/views/components/view.blade.php M resources/views/consumables/checkout.blade.php M resources/views/consumables/edit.blade.php M resources/views/consumables/view.blade.php M resources/views/custom_fields/fields/edit.blade.php M resources/views/custom_fields/fieldsets/edit.blade.php M resources/views/custom_fields/fieldsets/view.blade.php M resources/views/custom_fields/index.blade.php M resources/views/dashboard.blade.php M resources/views/departments/edit.blade.php M resources/views/depreciations/edit.blade.php M resources/views/depreciations/index.blade.php M resources/views/errors/403.blade.php M resources/views/errors/404.blade.php M resources/views/errors/503.blade.php M resources/views/groups/edit.blade.php M resources/views/groups/view.blade.php M resources/views/hardware/audit.blade.php M resources/views/hardware/bulk-checkout.blade.php M resources/views/hardware/bulk-delete.blade.php M resources/views/hardware/bulk.blade.php M resources/views/hardware/checkin.blade.php M resources/views/hardware/checkout.blade.php M resources/views/hardware/edit.blade.php M resources/views/hardware/history.blade.php M resources/views/hardware/index.blade.php M resources/views/hardware/qr-view.blade.php M resources/views/hardware/quickscan.blade.php M resources/views/hardware/requested.blade.php M resources/views/hardware/view.blade.php M resources/views/importer/import.blade.php M resources/views/layouts/basic.blade.php M resources/views/layouts/default.blade.php M resources/views/layouts/edit-form.blade.php M resources/views/layouts/setup.blade.php M resources/views/licenses/checkin.blade.php M resources/views/licenses/checkout.blade.php M resources/views/licenses/edit.blade.php M resources/views/licenses/view.blade.php M resources/views/locations/edit.blade.php M resources/views/locations/view.blade.php M resources/views/manufacturers/edit.blade.php M resources/views/modals/category.blade.php M resources/views/modals/location.blade.php M resources/views/modals/manufacturer.blade.php M resources/views/modals/model.blade.php M resources/views/modals/statuslabel.blade.php M resources/views/modals/supplier.blade.php M resources/views/modals/upload-file.blade.php M resources/views/modals/user.blade.php M resources/views/models/bulk-delete.blade.php M resources/views/models/bulk-edit.blade.php M resources/views/models/custom_fields_form.blade.php M resources/views/models/edit.blade.php M resources/views/models/index.blade.php M resources/views/models/view.blade.php M resources/views/partials/bootstrap-table.blade.php M resources/views/partials/forms/checkout-selector.blade.php M resources/views/partials/forms/edit/address.blade.php M resources/views/partials/forms/edit/asset-select.blade.php M resources/views/partials/forms/edit/category-select.blade.php M resources/views/partials/forms/edit/category.blade.php M resources/views/partials/forms/edit/company-select.blade.php M resources/views/partials/forms/edit/company.blade.php M resources/views/partials/forms/edit/department-select.blade.php M resources/views/partials/forms/edit/depreciation.blade.php M resources/views/partials/forms/edit/email.blade.php M resources/views/partials/forms/edit/image-upload.blade.php M resources/views/partials/forms/edit/item_number.blade.php M resources/views/partials/forms/edit/location-profile-select.blade.php M resources/views/partials/forms/edit/location-select.blade.php M resources/views/partials/forms/edit/location.blade.php M resources/views/partials/forms/edit/maintenance_type.blade.php M resources/views/partials/forms/edit/manufacturer-select.blade.php M resources/views/partials/forms/edit/manufacturer.blade.php M resources/views/partials/forms/edit/minimum_quantity.blade.php M resources/views/partials/forms/edit/model-select.blade.php M resources/views/partials/forms/edit/model_number.blade.php M resources/views/partials/forms/edit/name.blade.php M resources/views/partials/forms/edit/notes.blade.php M resources/views/partials/forms/edit/order_number.blade.php M resources/views/partials/forms/edit/phone.blade.php M resources/views/partials/forms/edit/purchase_cost.blade.php M resources/views/partials/forms/edit/purchase_date.blade.php M resources/views/partials/forms/edit/quantity.blade.php M resources/views/partials/forms/edit/serial.blade.php M resources/views/partials/forms/edit/status.blade.php M resources/views/partials/forms/edit/submit.blade.php M resources/views/partials/forms/edit/supplier-select.blade.php M resources/views/partials/forms/edit/supplier.blade.php M resources/views/partials/forms/edit/user-select.blade.php M resources/views/partials/forms/edit/warranty.blade.php M resources/views/reports/activity.blade.php M resources/views/reports/asset.blade.php M resources/views/reports/custom.blade.php M resources/views/reports/index.blade.php M resources/views/settings/alerts.blade.php M resources/views/settings/asset_tags.blade.php M resources/views/settings/backups.blade.php M resources/views/settings/barcodes.blade.php M resources/views/settings/branding.blade.php M resources/views/settings/general.blade.php M resources/views/settings/index.blade.php M resources/views/settings/labels.blade.php M resources/views/settings/ldap.blade.php M resources/views/settings/localization.blade.php M resources/views/settings/phpinfo.blade.php M resources/views/settings/purge-form.blade.php M resources/views/settings/security.blade.php M resources/views/settings/slack.blade.php M resources/views/setup/user.blade.php M resources/views/statuslabels/edit.blade.php M resources/views/statuslabels/index.blade.php M resources/views/suppliers/edit.blade.php M resources/views/suppliers/view.blade.php M resources/views/users/bulk-edit.blade.php M resources/views/users/confirm-bulk-delete.blade.php M resources/views/users/edit.blade.php M resources/views/users/index.blade.php M resources/views/users/ldap.blade.php M resources/views/users/print.blade.php M resources/views/users/view.blade.php M routes/api.php M routes/web/fields.php M routes/web/hardware.php M tests/functional/GroupsCest.php M upgrade.php M webpack.mix.js Your branch is behind 'origin/master' by 192 commits, and can be fast-forwarded. (use "git pull" to update your local branch) -- Updating ca1285ec0..001e72153 -------------------------------------------------------- Step 4: Cleaning up old cached files: -------------------------------------------------------- -- No bootstrap/cache/compiled.php, so nothing to delete. -- Deleting bootstrap/cache/services.php. It it no longer used. -- Deleting bootstrap/cache/config.php. It it no longer used. -- Configuration cache cleared! -- Cache cleared successfully. -- Route cache cleared! -- Compiled views cleared! -------------------------------------------------------- Step 5: Updating composer dependencies: (This may take an moment.) -------------------------------------------------------- -- We couldn't find a local composer.phar - trying globally. Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover Loading composer repositories with package information Installing dependencies from lock file Package operations: 1 install, 54 updates, 3 removals - Removing squizlabs/php_codesniffer (3.5.5) - Removing masterminds/html5 (2.7.0) - Removing alek13/slack (1.11.0) - Downgrading kylekatarnls/update-helper (1.2.1 => 1.2.0): Checking out 5786fa188e - Downgrading symfony/polyfill-util (v1.16.0 => v1.13.1): Checking out 964a67f293 - Downgrading symfony/polyfill-php56 (v1.16.0 => v1.13.1): Checking out 53dd1cdf3c - Downgrading symfony/polyfill-ctype (v1.16.0 => v1.13.1): Checking out f8f0b461be - Downgrading symfony/polyfill-php70 (v1.16.0 => v1.13.1): Checking out af23c7bb26 - Downgrading symfony/polyfill-mbstring (v1.16.0 => v1.13.1): Checking out 7b4aab9743 - Downgrading symfony/http-foundation (v3.4.40 => v3.4.36): Checking out d2d0cfe8e3 - Downgrading symfony/event-dispatcher (v3.4.40 => v3.4.36): Checking out f9031c22ec - Downgrading psr/log (1.1.3 => 1.1.2): Checking out 446d54b4cb - Downgrading symfony/debug (v3.4.40 => v3.4.36): Checking out f72e33fdb1 - Downgrading symfony/http-kernel (v3.4.40 => v3.4.36): Checking out c42c8339ac - Downgrading asm89/stack-cors (1.3.0 => 1.2.0): Checking out c163e2b614 - Downgrading symfony/finder (v3.4.40 => v3.4.36): Checking out 290ae21279 - Downgrading symfony/var-dumper (v3.4.40 => v3.4.36): Checking out 569e261461 - Downgrading maximebf/debugbar (v1.16.3 => v1.15.1): Checking out 6c4277f611 - Downgrading vlucas/phpdotenv (v2.6.4 => v2.6.1): Checking out 2a7dcf7e3e - Downgrading symfony/routing (v3.4.40 => v3.4.36): Checking out b689ccd48e - Downgrading symfony/process (v3.4.40 => v3.4.36): Checking out 9a4545c01e - Downgrading symfony/console (v3.4.40 => v3.4.36): Checking out 1ee23b3b65 - Downgrading symfony/polyfill-php72 (v1.16.0 => v1.13.1): Checking out 66fea50f6c - Downgrading symfony/polyfill-intl-idn (v1.16.0 => v1.13.1): Checking out 6f9c239e61 - Downgrading symfony/polyfill-iconv (v1.16.0 => v1.13.1): Checking out a019efccc0 - Downgrading egulias/email-validator (2.1.17 => 2.1.11): Checking out 92dd169c32 - Downgrading ramsey/uuid (3.9.3 => 3.9.1): Checking out 5ac2740e0c - Downgrading symfony/translation (v3.4.40 => v3.4.36): Checking out 0be25347c4 - Downgrading mtdowling/cron-expression (v1.2.3 => v1.2.1): Checking out 9504fa9ea6 - Downgrading monolog/monolog (1.25.3 => 1.25.2): Checking out d5e2fb341c - Downgrading league/flysystem (1.0.67 => 1.0.57): Checking out 0e9db7f0b9 - Downgrading erusev/parsedown (1.7.4 => 1.7.3): Checking out 6d89393817 - Downgrading laravel/framework (v5.5.49 => v5.5.48): Checking out e3e8d585dc - Downgrading barryvdh/laravel-debugbar (v3.3.3 => v3.2.8): Checking out 18208d6489 - Downgrading doctrine/annotations (1.10.2 => v1.8.0): Checking out 904dca4eb1 - Downgrading doctrine/reflection (1.2.1 => v1.0.0): Checking out 02538d3f95 - Downgrading doctrine/persistence (1.3.7 => 1.2.0): Checking out 43526ae633 - Downgrading doctrine/common (2.12.0 => v2.11.0): Checking out b8ca1dcf6b - Downgrading eduardokum/laravel-mail-auto-embed (1.0.5 => 1.0.4): Checking out 918c3aff22 - Downgrading enshrined/svg-sanitize (0.13.3 => 0.13.0): Checking out 4cf8d0f61e - Downgrading fideloper/proxy (4.3.0 => 4.2.1): Checking out 03085e58ec - Downgrading firebase/php-jwt (v5.2.0 => v5.0.0): Checking out 9984a4d3a3 - Downgrading league/csv (9.5.0 => 9.4.1): Checking out bf83acc23a - Downgrading neitanod/forceutf8 (v2.0.4 => v2.0.2): Checking out 30980a8ca2 - Downgrading phpdocumentor/reflection-common (2.1.0 => 2.0.0): Checking out 63a995caa1 - Downgrading phpseclib/phpseclib (2.0.27 => 2.0.23): Checking out c78eb5058d - Downgrading webmozart/assert (1.8.0 => 1.6.0): Checking out 573381c0a6 - Downgrading phpdocumentor/reflection-docblock (4.3.4 => 4.3.2): Checking out b83ff7cfcf - Downgrading phpspec/prophecy (v1.10.3 => 1.9.0): Checking out f6811d96d9 - Downgrading pragmarx/google2fa-laravel (v1.3.3 => v1.3.0): Checking out 4ccc17dbf5 - Downgrading nikic/php-parser (v4.4.0 => v4.3.0): Checking out 9a9981c347 - Removing dnoegel/php-xdg-base-dir (v0.1.1) - Installing dnoegel/php-xdg-base-dir (0.1): Cloning 265b859349 from cache - Downgrading psy/psysh (v0.9.12 => v0.9.11): Checking out 75d9ac1c16 - Downgrading schuppo/password-strength (v1.13 => v1.11): Checking out 7ab466d43c - Downgrading tecnickcom/tc-lib-color (1.12.15 => 1.12.13): Checking out 67402204a7 - Downgrading tecnickcom/tc-lib-barcode (1.15.20 => 1.15.16): Checking out 60780acd7a - Downgrading guzzlehttp/guzzle (6.5.3 => 6.4.1): Checking out 0895c93240 - Installing maknz/slack (1.7.0): Cloning 7f21fefc70 from cache Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover Carbon 1 is deprecated, see how to migrate to Carbon 2. https://carbon.nesbot.com/docs/#api-carbon-2 You can run './vendor/bin/upgrade-carbon' to get help in updating carbon and other frameworks and libraries that depend on it. Discovered Package: barryvdh/laravel-cors Discovered Package: barryvdh/laravel-debugbar Discovered Package: eduardokum/laravel-mail-auto-embed Discovered Package: fideloper/proxy Discovered Package: intervention/image Discovered Package: laravel/passport Discovered Package: laravel/tinker Discovered Package: laravelcollective/html Discovered Package: nesbot/carbon Discovered Package: pragmarx/google2fa-laravel Discovered Package: rollbar/rollbar-laravel Discovered Package: schuppo/password-strength Discovered Package: spatie/laravel-backup Discovered Package: tightenco/ziggy Discovered Package: unicodeveloper/laravel-password Package manifest generated successfully. Carbon 1 is deprecated, see how to migrate to Carbon 2. https://carbon.nesbot.com/docs/#api-carbon-2 You can run './vendor/bin/upgrade-carbon' to get help in updating carbon and other frameworks and libraries that depend on it. Discovered Package: barryvdh/laravel-cors Discovered Package: barryvdh/laravel-debugbar Discovered Package: eduardokum/laravel-mail-auto-embed Discovered Package: fideloper/proxy Discovered Package: intervention/image Discovered Package: laravel/passport Discovered Package: laravel/tinker Discovered Package: laravelcollective/html Discovered Package: nesbot/carbon Discovered Package: pragmarx/google2fa-laravel Discovered Package: rollbar/rollbar-laravel Discovered Package: schuppo/password-strength Discovered Package: spatie/laravel-backup Discovered Package: tightenco/ziggy Discovered Package: unicodeveloper/laravel-password Package manifest generated successfully. -------------------------------------------------------- Step 6: Migrating database: -------------------------------------------------------- -- Nothing to migrate. -------------------------------------------------------- Step 7: Checking for OAuth keys: -------------------------------------------------------- - OAuth keys detected. Skipping passport install. -------------------------------------------------------- Step 8: Caching routes and config: -------------------------------------------------------- -- Configuration cache cleared! Configuration cached successfully! -- Route cache cleared! Routes cached successfully! -------------------------------------------------------- Step 9: Taking application out of maintenance mode: -------------------------------------------------------- -- Application is now live. -------------------------------------------------------- FINISHED! Clear your browser cookies and re-login to use : your upgraded Snipe-IT. -------------------------------------------------------- ```

snipe / snipe-it