mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-03-14 20:39:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3972 from CachetHQ/dependabot/npm_and_yarn/es5-shim-4.5.14

Browse Source 
Bump es5-shim from 4.5.13 to 4.5.14
This commit is contained in:
James Brooks 2020-04-07 19:08:51 +01:00 committed by GitHub
commit d0146c56b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/StatusPageController.php
View File

@ -101,8 +101,8 @@ class StatusPageController extends AbstractApiController
$endDate->format('Y-m-d').' 00:00:00',
$startDate->format('Y-m-d').' 23:59:59',
])->orderBy('occurred_at', 'desc')->get()->groupBy(function (Incident $incident) {
return app(DateFactory::class)->make($incident->occurred_at)->toDateString();
});
return app(DateFactory::class)->make($incident->occurred_at)->toDateString();
});
if (!$onlyDisruptedDays) {
$incidentDays = array_pad([], $appIncidentDays, null);

8
app/Http/Controllers/SubscribeController.php
View File

@ -94,8 +94,12 @@ class SubscribeController extends Controller
$subscription->notify(new ManageSubscriptionNotification());
return redirect()->back()->withSuccess(
sprintf('%s %s', trans('dashboard.notifications.awesome'),
trans('cachet.subscriber.email.manage_subscription')));
sprintf(
'%s %s',
trans('dashboard.notifications.awesome'),
trans('cachet.subscriber.email.manage_subscription')
)
);
}
/**

2
package.json
View File

@ -16,7 +16,7 @@
"bootstrap-sass": "^3.4.1",
"chart.js": "^2.8.0",
"cross-env": "^5.1",
"es5-shim": "^4.5.9",
"es5-shim": "^4.5.14",
"flatpickr": "^4.5.7",
"github-markdown-css": "^2.3.0",
"ionicons": "~2.0",

1
tests/Bus/Events/Component/ComponentStatusWasChangedEventTest.php
View File

@ -26,6 +26,7 @@ class ComponentStatusWasChangedEventTest extends AbstractComponentEventTestCase
{
use DatabaseMigrations;
use InteractsWithMail;
public function testComponentUpdateEmailWasSent()
{
$user = factory('CachetHQ\Cachet\Models\User')->create();

9
tests/Functional/Notifications/MailTest.php
View File

@ -137,7 +137,8 @@ class MailTest extends AbstractTestCase
]);
Notification::assertSentTo(
[$subscriber], NewIncidentNotification::class
[$subscriber],
NewIncidentNotification::class
);
}
@ -161,7 +162,8 @@ class MailTest extends AbstractTestCase
]);
Notification::assertNotSentTo(
[$subscriber], NewIncidentNotification::class
[$subscriber],
NewIncidentNotification::class
);
}
@ -184,7 +186,8 @@ class MailTest extends AbstractTestCase
]);
Notification::assertSentTo(
[$subscriber], IncidentUpdatedNotification::class
[$subscriber],
IncidentUpdatedNotification::class
);
}
}

13
yarn.lock
View File

@ -2161,10 +2161,10 @@ es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
es6-symbol "~3.1.1"
next-tick "^1.0.0"
es5-shim@^4.5.9:
version "4.5.13"
resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.13.tgz#5d88062de049f8969f83783f4a4884395f21d28b"
integrity sha512-xi6hh6gsvDE0MaW4Vp1lgNEBpVcCXRWfPXj5egDvtgLz4L9MEvNwYEMdJH+JJinWkwa8c3c3o5HduV7dB/e1Hw==
es5-shim@^4.5.14:
version "4.5.14"
resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.14.tgz#90009e1019d0ea327447cb523deaff8fe45697ef"
integrity sha512-7SwlpL+2JpymWTt8sNLuC2zdhhc+wrfe5cMPI2j0o6WsPdfAiPwmFy2f0AocPB4RQVBOZ9kNTgi5YF7TdhkvEg==
es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
version "2.0.3"
@ -4525,6 +4525,11 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
dependencies:
wrappy "1"
opencollective-postinstall@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==
opn@^5.1.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"