Add latest changes from gitlab-org/gitlab@master

4 files changed, 27 insertions, 25 deletions

diff --git a/app/assets/javascripts/projects/commit/store/getters.js b/app/assets/javascripts/projects/commit/store/getters.js
index e0c36df8a75..b039ee3ba63 100644
--- a/app/assets/javascripts/projects/commit/store/getters.js
+++ b/app/assets/javascripts/projects/commit/store/getters.js
@@ -1,7 +1,7 @@
-import { uniq } from 'lodash';
+import { uniq, uniqBy } from 'lodash';
 
 export const joinedBranches = (state) => {
   return uniq(state.branches).sort();
 };
 
-export const sortedProjects = (state) => uniq(state.projects).sort();
+export const sortedProjects = (state) => uniqBy(state.projects, 'id').sort();
diff --git a/app/assets/javascripts/projects/merge_requests/index.js b/app/assets/javascripts/projects/merge_requests/index.js
deleted file mode 100644
index fd85a8d0dba..00000000000
--- a/app/assets/javascripts/projects/merge_requests/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Vue from 'vue';
-import ReportAbuseDropdownItem from './components/report_abuse_dropdown_item.vue';
-
-export const initReportAbuse = () => {
-  const el = document.getElementById('js-report-abuse-dropdown-item');
-
-  if (!el) return false;
-
-  const { reportAbusePath, reportedUserId, reportedFromUrl } = el.dataset;
-
-  return new Vue({
-    el,
-    name: 'ReportAbuseDropdownItemRoot',
-    provide: {
-      reportAbusePath,
-      reportedUserId: parseInt(reportedUserId, 10),
-      reportedFromUrl,
-    },
-    render(createElement) {
-      return createElement(ReportAbuseDropdownItem);
-    },
-  });
-};
diff --git a/app/assets/javascripts/projects/merge_requests/components/report_abuse_dropdown_item.vue b/app/assets/javascripts/projects/report_abuse/components/report_abuse_dropdown_item.vue
index ff76ca7c862..ff76ca7c862 100644
--- a/app/assets/javascripts/projects/merge_requests/components/report_abuse_dropdown_item.vue
+++ b/app/assets/javascripts/projects/report_abuse/components/report_abuse_dropdown_item.vue
diff --git a/app/assets/javascripts/projects/report_abuse/index.js b/app/assets/javascripts/projects/report_abuse/index.js
new file mode 100644
index 00000000000..9bcfdbf6165
--- /dev/null
+++ b/app/assets/javascripts/projects/report_abuse/index.js
@@ -0,0 +1,25 @@
+import Vue from 'vue';
+import ReportAbuseDropdownItem from './components/report_abuse_dropdown_item.vue';
+
+export const initReportAbuse = () => {
+  const items = document.querySelectorAll('.js-report-abuse-dropdown-item');
+
+  items.forEach((el) => {
+    if (!el) return false;
+
+    const { reportAbusePath, reportedUserId, reportedFromUrl } = el.dataset;
+
+    return new Vue({
+      el,
+      name: 'ReportAbuseDropdownItemRoot',
+      provide: {
+        reportAbusePath,
+        reportedUserId: parseInt(reportedUserId, 10),
+        reportedFromUrl,
+      },
+      render(createElement) {
+        return createElement(ReportAbuseDropdownItem);
+      },
+    });
+  });
+};