DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2016-10-31 13:25:54 -07:00
parent 41defb312b 10ea5daabd
commit adc3ebee41
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Auth/AuthController.php
View file

@ -176,7 +176,7 @@ class AuthController extends Controller
$google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');
if ($user->two_factor_secret=='') {
$user->two_factor_secret = $google2fa->generateSecretKey();
$user->two_factor_secret = $google2fa->generateSecretKey(32);
$user->save();
}

1
database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php
View file

@ -59,6 +59,7 @@ class MigrateAssetLogToActionLog extends Migration
$a->expected_checkin = $log->expected_checkin;
$a->thread_id = $log->thread_id;
$a->accepted_id = $log->accepted_id;
$a->filename = $log->filename;
$a->save();