Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 7 deletions

diff --git a/app/assets/javascripts/issues_list/components/issuable.vue b/app/assets/javascripts/issues_list/components/issuable.vue
index adfb234fe7a..46df5bb991c 100644
--- a/app/assets/javascripts/issues_list/components/issuable.vue
+++ b/app/assets/javascripts/issues_list/components/issuable.vue
@@ -28,7 +28,6 @@ import initUserPopovers from '~/user_popovers';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
 import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
 import { isScopedLabel } from '~/lib/utils/common_utils';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 import { convertToCamelCase } from '~/lib/utils/text_utility';
 
@@ -37,6 +36,9 @@ export default {
     openedAgo: __('opened %{timeAgoString} by %{user}'),
     openedAgoJira: __('opened %{timeAgoString} by %{user} in Jira'),
   },
+  inject: {
+    scopedLabels: ['scopedLabels'],
+  },
   components: {
     IssueAssignees,
     GlLink,
@@ -50,7 +52,6 @@ export default {
     GlTooltip,
     SafeHtml,
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     issuable: {
       type: Object,
@@ -85,9 +86,6 @@ export default {
 
       return this.issuableLink({ milestone_title: title });
     },
-    scopedLabelsAvailable() {
-      return this.glFeatures.scopedLabels;
-    },
     hasWeight() {
       return isNumber(this.issuable.weight);
     },
@@ -221,7 +219,7 @@ export default {
       return mergeUrlParams(params, this.baseUrl);
     },
     isScoped({ name }) {
-      return isScopedLabel({ title: name }) && this.scopedLabelsAvailable;
+      return isScopedLabel({ title: name }) && this.scopedLabels;
     },
     labelHref({ name }) {
       if (this.isJiraIssue) {
diff --git a/app/assets/javascripts/issues_list/index.js b/app/assets/javascripts/issues_list/index.js
index 1ff41c20d08..09185c8d804 100644
--- a/app/assets/javascripts/issues_list/index.js
+++ b/app/assets/javascripts/issues_list/index.js
@@ -41,10 +41,13 @@ function mountIssuablesListApp() {
   }
 
   document.querySelectorAll('.js-issuables-list').forEach(el => {
-    const { canBulkEdit, emptyStateMeta = {}, ...data } = el.dataset;
+    const { canBulkEdit, emptyStateMeta = {}, scopedLabels, ...data } = el.dataset;
 
     return new Vue({
       el,
+      provide: {
+        scopedLabels: parseBoolean(scopedLabels),
+      },
       render(createElement) {
         return createElement(IssuablesListApp, {
           props: {