Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 1 deletions

diff --git a/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue b/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
index 8f318b10744..eb73f8e0182 100644
--- a/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
+++ b/app/assets/javascripts/issues/dashboard/components/issues_dashboard_app.vue
@@ -81,6 +81,7 @@ export default {
   },
   inject: [
     'autocompleteAwardEmojisPath',
+    'autocompleteUsersPath',
     'calendarPath',
     'dashboardLabelsPath',
     'dashboardMilestonesPath',
@@ -384,7 +385,9 @@ export default {
       });
     },
     fetchUsers(search) {
-      return axios.get('/-/autocomplete/users.json', { params: { active: true, search } });
+      return axios.get(this.autocompleteUsersPath, {
+        params: { active: true, search },
+      });
     },
     getStatus(issue) {
       if (issue.state === STATUS_CLOSED && issue.moved) {
diff --git a/app/assets/javascripts/issues/dashboard/index.js b/app/assets/javascripts/issues/dashboard/index.js
index 999f07781b2..74633b251b2 100644
--- a/app/assets/javascripts/issues/dashboard/index.js
+++ b/app/assets/javascripts/issues/dashboard/index.js
@@ -15,6 +15,7 @@ export async function mountIssuesDashboardApp() {
 
   const {
     autocompleteAwardEmojisPath,
+    autocompleteUsersPath,
     calendarPath,
     dashboardLabelsPath,
     dashboardMilestonesPath,
@@ -38,6 +39,7 @@ export async function mountIssuesDashboardApp() {
     }),
     provide: {
       autocompleteAwardEmojisPath,
+      autocompleteUsersPath,
       calendarPath,
       dashboardLabelsPath,
       dashboardMilestonesPath,