Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 8 deletions

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