diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-08 21:27:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-08 21:27:36 +0100 |
| commit | 246addd5b33a172600342af3fb6fb5e4c80ad95e (patch) | |
| tree | 98b87efd3f5f3d41d75482707924fde708c074ec /app/javascript/flavours/glitch/actions | |
| parent | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (diff) | |
| parent | 49027ee948bc76cc89214f8f340d353763796f1d (diff) | |
Merge pull request #1251 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/actions')
| -rw-r--r-- | app/javascript/flavours/glitch/actions/notifications.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js index 7effb07d1..940f3c3d4 100644 --- a/app/javascript/flavours/glitch/actions/notifications.js +++ b/app/javascript/flavours/glitch/actions/notifications.js @@ -121,7 +121,7 @@ const excludeTypesFromSettings = state => state.getIn(['settings', 'notification const excludeTypesFromFilter = filter => { - const allTypes = ImmutableList(['follow', 'favourite', 'reblog', 'mention', 'poll']); + const allTypes = ImmutableList(['follow', 'follow_request', 'favourite', 'reblog', 'mention', 'poll']); return allTypes.filterNot(item => item === filter).toJS(); }; |