Merge branch 'master' into 1680-upstreams-file

2020-09-09 14:51:27 +03:00
parent 90e4316cfc 9a49161f15
commit 7720d0dfbc
9 changed files with 34 additions and 15 deletions
--- a/client/src/helpers/constants.js
+++ b/client/src/helpers/constants.js
@@ -294,8 +294,11 @@ export const QUERY_LOG_INTERVALS_DAYS = [1, 7, 30, 90];

 export const FILTERS_INTERVALS_HOURS = [0, 1, 12, 24, 72, 168];

+// Note that translation strings contain these modes (blocking_mode_CONSTANT)
+// i.e. blocking_mode_default, blocking_mode_null_ip
 export const BLOCKING_MODES = {
    default: 'default',
+    refused: 'refused',
    nxdomain: 'nxdomain',
    null_ip: 'null_ip',
    custom_ip: 'custom_ip',