diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 06:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 06:09:30 +0300 |
| commit | 8007620dc7216ff2b9e7dde0aa88e6f47fc433e7 (patch) | |
| tree | 88022526af20aee894008f852f79b40f70eeec1a /app/assets/javascripts/incidents | |
| parent | 9c1284626ff95f13a34756b1d201a87ed61f9837 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/incidents')
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index 9d86c551af3..45169f50a2e 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -354,7 +354,7 @@ export default { return INCIDENT_SEVERITY[severity]; }, handleFilterIncidents(filters) { - const filterParams = { authorUsername: '', assigneeUsername: [], search: '' }; + const filterParams = { authorUsername: '', assigneeUsername: '', search: '' }; filters.forEach(filter => { if (typeof filter === 'object') { @@ -363,7 +363,7 @@ export default { filterParams.authorUsername = filter.value.data; break; case 'assignee_username': - filterParams.assigneeUsername.push(filter.value.data); + filterParams.assigneeUsername = filter.value.data; break; case 'filtered-search-term': if (filter.value.data !== '') filterParams.search = filter.value.data; diff --git a/app/assets/javascripts/incidents/graphql/queries/get_count_by_status.query.graphql b/app/assets/javascripts/incidents/graphql/queries/get_count_by_status.query.graphql index 1346b3e6fff..fd96825c0f7 100644 --- a/app/assets/javascripts/incidents/graphql/queries/get_count_by_status.query.graphql +++ b/app/assets/javascripts/incidents/graphql/queries/get_count_by_status.query.graphql @@ -3,7 +3,7 @@ query getIncidentsCountByStatus( $projectPath: ID! $issueTypes: [IssueType!] $authorUsername: String = "" - $assigneeUsernames: [String!] = [] + $assigneeUsernames: String = "" ) { project(fullPath: $projectPath) { issueStatusCounts( diff --git a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql index 27834b9dec4..dd2a42ba4e8 100644 --- a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql +++ b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql @@ -11,7 +11,7 @@ query getIncidents( $nextPageCursor: String = "" $searchTerm: String = "" $authorUsername: String = "" - $assigneeUsernames: [String!] = [] + $assigneeUsernames: String = "" ) { project(fullPath: $projectPath) { issues( |