github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into plugin-pack-installer

Browse source
This commit is contained in:
Jim Unger 2016-03-18 09:15:21 -05:00
commit 36ee2b4a32
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ui/public/notify/__tests__/notifier.js
View file

@ -43,8 +43,8 @@ describe('Notifier', function () {
expect(notify('error').title).to.equal('Error');
});
it('sets lifetime to Infinity', function () {
expect(notify('error').lifetime).to.equal(Infinity);
it('sets lifetime to 5 minutes', function () {
expect(notify('error').lifetime).to.equal(300000);
});
it('allows reporting', function () {

2
src/ui/public/notify/notifier.js
View file

@ -229,7 +229,7 @@ Notifier.prototype.error = function (err, cb) {
content: formatMsg(err, this.from),
icon: 'warning',
title: 'Error',
lifetime: Infinity,
lifetime: 300000,
actions: ['report', 'accept'],
stack: formatStack(err)
}, cb);