Skip to content

Commit

Permalink
Merge pull request #6569 from spalger/backport/6150/4.x
Browse files Browse the repository at this point in the history
Backport #6150 to 4.x
  • Loading branch information
spalger committed Mar 17, 2016
2 parents 59d53ef + acd933c commit 804b7d3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/ui/public/notify/__tests__/notifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/notify/notifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ define(function (require) {
content: formatMsg(err, this.from),
icon: 'warning',
title: 'Error',
lifetime: Infinity,
lifetime: 300000,
actions: ['report', 'accept'],
stack: formatStack(err)
}, cb);
Expand Down

0 comments on commit 804b7d3

Please sign in to comment.