diff --git a/VERSION.txt b/VERSION.txt index db6211c40693..f66977e2e453 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.41 \ No newline at end of file +5.1.42 \ No newline at end of file diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 7daf38feed40..1d27e5d5d7c3 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -16,6 +16,7 @@ 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 { @@ -69,8 +70,21 @@ class SelfUpdateController extends BaseController $output = ''; try { - // $res = $repo->pull(); + + $cacheCompiled = base_path('bootstrap/cache/compiled.php'); + if (file_exists($cacheCompiled)) { unlink ($cacheCompiled); } + $cacheServices = base_path('bootstrap/cache/services.php'); + if (file_exists($cacheServices)) { unlink ($cacheServices); } + Artisan::call('clear-compiled'); + Artisan::call('cache:clear'); + Artisan::call('debugbar:clear'); + Artisan::call('route:clear'); + Artisan::call('view:clear'); + Artisan::call('config:clear'); + + $output = $repo->execute('stash'); + $output = $repo->execute('reset hard origin/v5-stable'); $output = $repo->execute('pull origin'); } catch (GitException $e) { diff --git a/app/Http/Controllers/WebhookController.php b/app/Http/Controllers/WebhookController.php index 84dd09d16876..080b533fce3e 100644 --- a/app/Http/Controllers/WebhookController.php +++ b/app/Http/Controllers/WebhookController.php @@ -361,6 +361,7 @@ class WebhookController extends BaseController $webhook->user_id = auth()->user()->id; $webhook->event_id = $event_id; $webhook->target_url = $target_url; + $webhook->fill($request->all()); $webhook->save(); if (! $webhook->id) { diff --git a/config/ninja.php b/config/ninja.php index 683b30f25629..35197d2027b5 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,7 +14,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.41', + 'app_version' => '5.1.42', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),