tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5391 from turbo124/v5-stable

Browse source 
V5 stable
This commit is contained in:
David Bomba 2021-04-09 08:38:48 +10:00 • committed by GitHub
commit 1a8dd34c0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/SelfUpdateController.php
View file

@ -16,7 +16,6 @@ use Cz\Git\GitException;
use Cz\Git\GitRepository;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Artisan;
class SelfUpdateController extends BaseController
{
@ -83,8 +82,8 @@ class SelfUpdateController extends BaseController
Artisan::call('view:clear');
Artisan::call('config:clear');
$output = $repo->execute('stash');
$output = $repo->execute('reset hard origin/v5-stable');
// $output = $repo->execute('stash');
// $output = $repo->execute('reset --hard origin/v5-stable');
$output = $repo->execute('pull origin');
} catch (GitException $e) {