diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/assets/javascripts/incidents | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/incidents')
| -rw-r--r-- | app/assets/javascripts/incidents/components/incidents_list.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/incidents/list.js | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index 0e3839deaf5..7d44a28b4bb 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -265,9 +265,7 @@ export default { if (field?.sortKey) { sortKey = field.sortKey; } else { - sortKey = convertToSnakeCase(sortBy) - .replace(/_.*/, '') - .toUpperCase(); + sortKey = convertToSnakeCase(sortBy).replace(/_.*/, '').toUpperCase(); } this.pagination = initialPaginationState; diff --git a/app/assets/javascripts/incidents/list.js b/app/assets/javascripts/incidents/list.js index 6f87fbbe775..8644ff3a249 100644 --- a/app/assets/javascripts/incidents/list.js +++ b/app/assets/javascripts/incidents/list.js @@ -29,6 +29,9 @@ export default () => { return new Vue({ el: selector, + components: { + IncidentsList, + }, provide: { projectPath, incidentTemplateName, @@ -43,9 +46,6 @@ export default () => { slaFeatureAvailable: parseBoolean(slaFeatureAvailable), }, apolloProvider, - components: { - IncidentsList, - }, render(createElement) { return createElement('incidents-list'); }, |