diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-07-20 11:24:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 11:24:32 -0400 |
| commit | e7edb4d1eeba6c12a1c71271faa30d2bbf00d054 (patch) | |
| tree | f373d05c4ea43bd335910f3603fab3d866a2486e /app/javascript/mastodon/actions/timelines.js | |
| parent | d2352246920800e491466d84b0146feb4d1d791f (diff) | |
| parent | 1fcdaafa6fbe6d746a096c33263d76e6819da46d (diff) | |
Merge pull request #87 from tootsuite/master
merge upstream
Diffstat (limited to 'app/javascript/mastodon/actions/timelines.js')
| -rw-r--r-- | app/javascript/mastodon/actions/timelines.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js index dd14cb1cd..5c0cd93c7 100644 --- a/app/javascript/mastodon/actions/timelines.js +++ b/app/javascript/mastodon/actions/timelines.js @@ -105,7 +105,7 @@ export function refreshTimelineFail(timeline, error, skipLoading) { timeline, error, skipLoading, - skipAlert: error.response.status === 404, + skipAlert: error.response && error.response.status === 404, }; }; |