diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-02-25 11:00:24 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-02-26 12:24:39 +0100 |
commit | a555a227dd7a846e5b8e8c84839120d40f9d1090 (patch) | |
tree | 7834ad40f3da966653f7f5ed8a5bf0c118f0b1b1 /app/assets/javascripts/filtered_search | |
parent | afd290a444d09e84092e5a5d738bcf28ec71f3c6 (diff) | |
download | gitlab-ce-a555a227dd7a846e5b8e8c84839120d40f9d1090.tar.gz |
Merge branch 'filter-confidential-issues' into 'master'
Ability to filter confidential issues
Closes #50747
See merge request gitlab-org/gitlab-ce!24960
Diffstat (limited to 'app/assets/javascripts/filtered_search')
-rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_token_keys.js | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js index 57ec6603d80..4d05f46ed17 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js @@ -96,6 +96,11 @@ export default class FilteredSearchDropdownManager { gl: DropdownNonUser, element: this.container.querySelector('#js-dropdown-wip'), }, + confidential: { + reference: null, + gl: DropdownNonUser, + element: this.container.querySelector('#js-dropdown-confidential'), + }, status: { reference: null, gl: NullDropdown, diff --git a/app/assets/javascripts/filtered_search/filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/filtered_search_token_keys.js index b70da240833..48534bdf815 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_token_keys.js +++ b/app/assets/javascripts/filtered_search/filtered_search_token_keys.js @@ -72,6 +72,23 @@ export default class FilteredSearchTokenKeys { ); } + addExtraTokensForIssues() { + const confidentialToken = { + key: 'confidential', + type: 'string', + param: '', + symbol: '', + icon: 'eye-slash', + tag: 'Yes or No', + lowercaseValueOnSubmit: true, + uppercaseTokenName: false, + capitalizeTokenValue: true, + }; + + this.tokenKeys.push(confidentialToken); + this.tokenKeysWithAlternative.push(confidentialToken); + } + addExtraTokensForMergeRequests() { const wipToken = { key: 'wip', |