Merge branch 'develop' into feature/react-admin
This commit is contained in:
commit
01c03b6b77
19 changed files with 614 additions and 274 deletions
|
@ -37,6 +37,7 @@ class EmailSettingsCommand extends Command
|
|||
{--encryption=}
|
||||
{--host=}
|
||||
{--port=}
|
||||
{--endpoint=}
|
||||
{--username=}
|
||||
{--password=}';
|
||||
|
||||
|
@ -140,6 +141,11 @@ class EmailSettingsCommand extends Command
|
|||
trans('command/messages.environment.mail.ask_mailgun_secret'),
|
||||
$this->config->get('services.mailgun.secret')
|
||||
);
|
||||
|
||||
$this->variables['MAILGUN_ENDPOINT'] = $this->option('endpoint') ?? $this->ask(
|
||||
trans('command/messages.environment.mail.ask_mailgun_endpoint'),
|
||||
$this->config->get('services.mailgun.endpoint')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -28,7 +28,7 @@ class PruneOrphanedBackupsCommand extends Command
|
|||
|
||||
$query = $repository->getBuilder()
|
||||
->whereNull('completed_at')
|
||||
->whereDate('created_at', '<=', CarbonImmutable::now()->subMinutes($since));
|
||||
->where('created_at', '<=', CarbonImmutable::now()->subMinutes($since)->toDateTimeString());
|
||||
|
||||
$count = $query->count();
|
||||
if (!$count) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue