Commit 50cb6353 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'leipert-backport-ee-changes' into 'master'

Backport EE changes (missing exports)

See merge request gitlab-org/gitlab-ce!21772
parents 99c3d45e 276c4ae6
import FilteredSearchTokenKeys from './filtered_search_token_keys'; import FilteredSearchTokenKeys from './filtered_search_token_keys';
const tokenKeys = [{ export const tokenKeys = [{
key: 'author', key: 'author',
type: 'string', type: 'string',
param: 'username', param: 'username',
...@@ -42,14 +42,14 @@ if (gon.current_user_id) { ...@@ -42,14 +42,14 @@ if (gon.current_user_id) {
}); });
} }
const alternativeTokenKeys = [{ export const alternativeTokenKeys = [{
key: 'label', key: 'label',
type: 'string', type: 'string',
param: 'name', param: 'name',
symbol: '~', symbol: '~',
}]; }];
const conditions = [{ export const conditions = [{
url: 'assignee_id=0', url: 'assignee_id=0',
tokenKey: 'assignee', tokenKey: 'assignee',
value: 'none', value: 'none',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment