diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-17 16:32:30 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-17 16:32:30 +0300 |
| commit | 50cb63533ff4d90ae317b20157c3fd824783fd61 (patch) | |
| tree | 99e6ac8c650576ceb5e04972aca15bf7331ef602 /app | |
| parent | 99c3d45e6f56ff5fef8b2ad03b1bad25f66419eb (diff) | |
| parent | 276c4ae66f8092f725160e6477db95df9ce1da47 (diff) | |
Merge branch 'leipert-backport-ee-changes' into 'master'
Backport EE changes (missing exports)
See merge request gitlab-org/gitlab-ce!21772
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js | 6 |
1 files changed, 3 insertions, 3 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 cce2c07dc3e..6c9499864c5 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 @@ -1,6 +1,6 @@ import FilteredSearchTokenKeys from './filtered_search_token_keys'; -const tokenKeys = [{ +export const tokenKeys = [{ key: 'author', type: 'string', param: 'username', @@ -42,14 +42,14 @@ if (gon.current_user_id) { }); } -const alternativeTokenKeys = [{ +export const alternativeTokenKeys = [{ key: 'label', type: 'string', param: 'name', symbol: '~', }]; -const conditions = [{ +export const conditions = [{ url: 'assignee_id=0', tokenKey: 'assignee', value: 'none', |