summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-11-01 11:07:09 +0000
committerSean McGivern <sean@gitlab.com>2018-11-01 11:07:09 +0000
commitc49f57fe430edeac9a5f2423dac7afb80ff72576 (patch)
tree23c8e45711083748f18d81a9f40f3b464e4b62cb /app/assets
parentf7c0a18b8a061bfea650897b22dce24d712c6439 (diff)
parent8df7e6021b0da30e3b7550ca83cd9ab3f991c235 (diff)
downloadgitlab-ce-c49f57fe430edeac9a5f2423dac7afb80ff72576.tar.gz
Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
index db115583165..bb0ecb8efe7 100644
--- a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
+++ b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
@@ -92,6 +92,16 @@ export const conditions = [
tokenKey: 'label',
value: 'none',
},
+ {
+ url: 'my_reaction_emoji=None',
+ tokenKey: 'my-reaction',
+ value: 'none',
+ },
+ {
+ url: 'my_reaction_emoji=Any',
+ tokenKey: 'my-reaction',
+ value: 'any',
+ },
];
const IssuableFilteredSearchTokenKeys = new FilteredSearchTokenKeys(