Commit 67e19769 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu Committed by Brandon Labuschagne

Remove unused scoped labels feature flag

The scoped labels feature is no longer feature flagged
parent 864c7a2c
...@@ -28,7 +28,6 @@ import initUserPopovers from '~/user_popovers'; ...@@ -28,7 +28,6 @@ import initUserPopovers from '~/user_popovers';
import { mergeUrlParams } from '~/lib/utils/url_utility'; import { mergeUrlParams } from '~/lib/utils/url_utility';
import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
import { isScopedLabel } from '~/lib/utils/common_utils'; import { isScopedLabel } from '~/lib/utils/common_utils';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import { convertToCamelCase } from '~/lib/utils/text_utility'; import { convertToCamelCase } from '~/lib/utils/text_utility';
...@@ -37,6 +36,9 @@ export default { ...@@ -37,6 +36,9 @@ export default {
openedAgo: __('opened %{timeAgoString} by %{user}'), openedAgo: __('opened %{timeAgoString} by %{user}'),
openedAgoJira: __('opened %{timeAgoString} by %{user} in Jira'), openedAgoJira: __('opened %{timeAgoString} by %{user} in Jira'),
}, },
inject: {
scopedLabels: ['scopedLabels'],
},
components: { components: {
IssueAssignees, IssueAssignees,
GlLink, GlLink,
...@@ -50,7 +52,6 @@ export default { ...@@ -50,7 +52,6 @@ export default {
GlTooltip, GlTooltip,
SafeHtml, SafeHtml,
}, },
mixins: [glFeatureFlagsMixin()],
props: { props: {
issuable: { issuable: {
type: Object, type: Object,
...@@ -85,9 +86,6 @@ export default { ...@@ -85,9 +86,6 @@ export default {
return this.issuableLink({ milestone_title: title }); return this.issuableLink({ milestone_title: title });
}, },
scopedLabelsAvailable() {
return this.glFeatures.scopedLabels;
},
hasWeight() { hasWeight() {
return isNumber(this.issuable.weight); return isNumber(this.issuable.weight);
}, },
...@@ -221,7 +219,7 @@ export default { ...@@ -221,7 +219,7 @@ export default {
return mergeUrlParams(params, this.baseUrl); return mergeUrlParams(params, this.baseUrl);
}, },
isScoped({ name }) { isScoped({ name }) {
return isScopedLabel({ title: name }) && this.scopedLabelsAvailable; return isScopedLabel({ title: name }) && this.scopedLabels;
}, },
labelHref({ name }) { labelHref({ name }) {
if (this.isJiraIssue) { if (this.isJiraIssue) {
......
...@@ -41,10 +41,13 @@ function mountIssuablesListApp() { ...@@ -41,10 +41,13 @@ function mountIssuablesListApp() {
} }
document.querySelectorAll('.js-issuables-list').forEach(el => { document.querySelectorAll('.js-issuables-list').forEach(el => {
const { canBulkEdit, emptyStateMeta = {}, ...data } = el.dataset; const { canBulkEdit, emptyStateMeta = {}, scopedLabels, ...data } = el.dataset;
return new Vue({ return new Vue({
el, el,
provide: {
scopedLabels: parseBoolean(scopedLabels),
},
render(createElement) { render(createElement) {
return createElement(IssuablesListApp, { return createElement(IssuablesListApp, {
props: { props: {
......
...@@ -8,9 +8,6 @@ module IssuableActions ...@@ -8,9 +8,6 @@ module IssuableActions
before_action :authorize_destroy_issuable!, only: :destroy before_action :authorize_destroy_issuable!, only: :destroy
before_action :check_destroy_confirmation!, only: :destroy before_action :check_destroy_confirmation!, only: :destroy
before_action :authorize_admin_issuable!, only: :bulk_update before_action :authorize_admin_issuable!, only: :bulk_update
before_action only: :show do
push_frontend_feature_flag(:scoped_labels, type: :licensed, default_enabled: true)
end
before_action do before_action do
push_frontend_feature_flag(:not_issuable_queries, @project, default_enabled: true) push_frontend_feature_flag(:not_issuable_queries, @project, default_enabled: true)
end end
......
...@@ -54,10 +54,6 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -54,10 +54,6 @@ class Projects::IssuesController < Projects::ApplicationController
gon.push({ features: { real_time_feature_flag.to_s.camelize(:lower) => real_time_enabled } }, true) gon.push({ features: { real_time_feature_flag.to_s.camelize(:lower) => real_time_enabled } }, true)
end end
before_action only: :index do
push_frontend_feature_flag(:scoped_labels, @project, type: :licensed)
end
around_action :allow_gitaly_ref_name_caching, only: [:discussions] around_action :allow_gitaly_ref_name_caching, only: [:discussions]
respond_to :html respond_to :html
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
'can-bulk-edit': @can_bulk_update.to_json, 'can-bulk-edit': @can_bulk_update.to_json,
'empty-state-meta': { svg_path: image_path('illustrations/issues.svg') }, 'empty-state-meta': { svg_path: image_path('illustrations/issues.svg') },
'sort-key': @sort, 'sort-key': @sort,
type: 'issues' } } type: 'issues',
'scoped-labels': @group.feature_available?(:scoped_labels).to_json } }
- else - else
= render 'shared/issues' = render 'shared/issues'
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
'empty-state-meta': data_empty_state_meta.to_json, 'empty-state-meta': data_empty_state_meta.to_json,
'can-bulk-edit': @can_bulk_update.to_json, 'can-bulk-edit': @can_bulk_update.to_json,
'sort-key': @sort, 'sort-key': @sort,
type: type } } type: type,
'scoped-labels': @project.feature_available?(:scoped_labels).to_json } }
- else - else
- empty_state_path = local_assigns.fetch(:empty_state_path, 'shared/empty_states/issues') - empty_state_path = local_assigns.fetch(:empty_state_path, 'shared/empty_states/issues')
%ul.content-list.issues-list.issuable-list{ class: ("manual-ordering" if @sort == 'relative_position') } %ul.content-list.issues-list.issuable-list{ class: ("manual-ordering" if @sort == 'relative_position') }
......
...@@ -11,10 +11,6 @@ module EE ...@@ -11,10 +11,6 @@ module EE
before_action :ee_authorize_admin_group!, only: [:restore] before_action :ee_authorize_admin_group!, only: [:restore]
before_action only: :issues do
push_frontend_feature_flag(:scoped_labels, @group, type: :licensed)
end
feature_category :subgroups, [:restore] feature_category :subgroups, [:restore]
end end
......
...@@ -10,4 +10,5 @@ ...@@ -10,4 +10,5 @@
'empty-state-meta': { svg_path: image_path('illustrations/issues.svg') }, 'empty-state-meta': { svg_path: image_path('illustrations/issues.svg') },
'sort-key': @sort, 'sort-key': @sort,
type: 'jira', type: 'jira',
project_path: @project.full_path, } } 'project-path': @project.full_path,
'scoped-labels': @project.feature_available?(:scoped_labels).to_json } }
...@@ -46,10 +46,8 @@ describe('Issuable component', () => { ...@@ -46,10 +46,8 @@ describe('Issuable component', () => {
...props, ...props,
}, },
provide: { provide: {
glFeatures: {
scopedLabels, scopedLabels,
}, },
},
stubs: { stubs: {
'gl-sprintf': GlSprintf, 'gl-sprintf': GlSprintf,
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment