diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/issues_list | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/issues_list')
-rw-r--r-- | app/assets/javascripts/issues_list/components/issuable.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/issues_list/index.js | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/issues_list/components/issuable.vue b/app/assets/javascripts/issues_list/components/issuable.vue index dc63d613b5b..b12b20d0135 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,7 @@ export default { openedAgo: __('opened %{timeAgoString} by %{user}'), openedAgoJira: __('opened %{timeAgoString} by %{user} in Jira'), }, + inject: ['scopedLabelsAvailable'], components: { IssueAssignees, GlLink, @@ -50,7 +50,6 @@ export default { GlTooltip, SafeHtml, }, - mixins: [glFeatureFlagsMixin()], props: { issuable: { type: Object, @@ -85,9 +84,6 @@ export default { return this.issuableLink({ milestone_title: title }); }, - scopedLabelsAvailable() { - return this.glFeatures.scopedLabels; - }, hasWeight() { return isNumber(this.issuable.weight); }, diff --git a/app/assets/javascripts/issues_list/index.js b/app/assets/javascripts/issues_list/index.js index 1ff41c20d08..5ef86536865 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 = {}, scopedLabelsAvailable, ...data } = el.dataset; return new Vue({ el, + provide: { + scopedLabelsAvailable: parseBoolean(scopedLabelsAvailable), + }, render(createElement) { return createElement(IssuablesListApp, { props: { |