diff --git a/.gitlab/lint/unused_helper_methods/potential_methods_to_remove.yml b/.gitlab/lint/unused_helper_methods/potential_methods_to_remove.yml index 89e78f732ed..f1860b838ad 100644 --- a/.gitlab/lint/unused_helper_methods/potential_methods_to_remove.yml +++ b/.gitlab/lint/unused_helper_methods/potential_methods_to_remove.yml @@ -5,8 +5,6 @@ # If it turns out that a method you are attempting to remove is in fact in use, # remove it from this file and add it to `excluded_methods.yml`. # -tag_pair_for_link: - file: ee/app/helpers/admin/application_settings_helper.rb compliance_frameworks_list_data: file: ee/app/helpers/compliance_management/compliance_framework/group_settings_helper.rb project_vulnerability_path: diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml index 171e14cb72e..542b9261454 100644 --- a/.rubocop_todo/rspec/be_eq.yml +++ b/.rubocop_todo/rspec/be_eq.yml @@ -131,7 +131,6 @@ RSpec/BeEq: - 'ee/spec/lib/gitlab/database/desired_sharding_key_spec.rb' - 'ee/spec/lib/gitlab/duo/chat/react_executor_spec.rb' - 'ee/spec/lib/gitlab/duo_workflow/client_spec.rb' - - 'ee/spec/lib/gitlab/elastic/document_reference_spec.rb' - 'ee/spec/lib/gitlab/elastic/elasticsearch_enabled_cache_spec.rb' - 'ee/spec/lib/gitlab/geo/event_gap_tracking_spec.rb' - 'ee/spec/lib/gitlab/geo/oauth/login_state_spec.rb' diff --git a/.rubocop_todo/rspec/identical_equality_assertion.yml b/.rubocop_todo/rspec/identical_equality_assertion.yml index 9518ff52d94..ed4b750b441 100644 --- a/.rubocop_todo/rspec/identical_equality_assertion.yml +++ b/.rubocop_todo/rspec/identical_equality_assertion.yml @@ -2,7 +2,6 @@ RSpec/IdenticalEqualityAssertion: Exclude: - 'ee/spec/lib/gitlab/ci/reports/license_scanning/license_spec.rb' - - 'ee/spec/lib/gitlab/elastic/document_reference_spec.rb' - 'ee/spec/lib/gitlab/geo/oauth/login_state_spec.rb' - 'ee/spec/lib/gitlab/llm/ai_message_spec.rb' - 'ee/spec/lib/search/cluster_health_check/elastic_spec.rb' diff --git a/.rubocop_todo/style/symbol_proc.yml b/.rubocop_todo/style/symbol_proc.yml index ebe4b451c43..64e100d9a25 100644 --- a/.rubocop_todo/style/symbol_proc.yml +++ b/.rubocop_todo/style/symbol_proc.yml @@ -73,7 +73,6 @@ Style/SymbolProc: - 'ee/spec/features/billings/qrtly_reconciliation_alert_spec.rb' - 'ee/spec/helpers/ee/registrations_helper_spec.rb' - 'ee/spec/lib/ee/gitlab/search_results_spec.rb' - - 'ee/spec/lib/gitlab/elastic/document_reference_spec.rb' - 'ee/spec/services/groups/participants_service_spec.rb' - 'ee/spec/support/helpers/subscription_portal_helpers.rb' - 'ee/spec/support/shared_examples/lib/gitlab/graphql/issuables_lazy_links_aggregate_shared_examples.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 2186bc8e702..16fe8dd6957 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -02eb9160dd6a4825e892b22eb5543c5c1da5cc65 +398249273423b358d1c226d6379391f5bf0c927c diff --git a/app/assets/javascripts/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue b/app/assets/javascripts/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue index a128ab0c727..ae8d2a0f3e4 100644 --- a/app/assets/javascripts/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue +++ b/app/assets/javascripts/work_items/components/work_item_bulk_edit/work_item_bulk_edit_sidebar.vue @@ -4,6 +4,7 @@ import { createAlert } from '~/alert'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import axios from '~/lib/utils/axios_utils'; import { __, s__ } from '~/locale'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { BULK_UPDATE_UNASSIGNED } from '../../constants'; import workItemBulkUpdateMutation from '../../graphql/list/work_item_bulk_update.mutation.graphql'; import workItemParent from '../../graphql/list/work_item_parent.query.graphql'; @@ -36,6 +37,7 @@ export default { WorkItemBulkEditDropdown, WorkItemBulkEditLabels, }, + mixins: [glFeatureFlagsMixin()], inject: ['hasIssuableHealthStatusFeature'], props: { checkedItems: { @@ -74,14 +76,16 @@ export default { query: workItemParent, variables() { return { - fullPath: this.fullPath, + fullPath: this.isGroup + ? this.fullPath + : this.fullPath.substring(0, this.fullPath.lastIndexOf('/')), }; }, update(data) { return data.namespace.id; }, skip() { - return !this.isEpicsList; + return !this.shouldUseGraphQLBulkEdit; }, }, }, @@ -91,12 +95,17 @@ export default { const basePath = this.isGroup ? `groups/${this.fullPath}` : this.fullPath; return `${domain}/${basePath}/-/issues/bulk_update`; }, + shouldUseGraphQLBulkEdit() { + return this.isEpicsList || this.glFeatures.workItemsBulkEdit; + }, }, methods: { async handleFormSubmitted() { this.$emit('start'); - const executeBulkEdit = this.isEpicsList ? this.performBulkEdit : this.performLegacyBulkEdit; + const executeBulkEdit = this.shouldUseGraphQLBulkEdit + ? this.performBulkEdit + : this.performLegacyBulkEdit; try { await executeBulkEdit(); @@ -154,7 +163,7 @@ export default {