diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 634c0a2e55c..38e4077682a 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -2278,6 +2278,7 @@ Gitlab/NamespacedClass: - 'ee/app/policies/instance_security_dashboard_policy.rb' - 'ee/app/policies/issuable_metric_image_policy.rb' - 'ee/app/policies/iteration_policy.rb' + - 'ee/app/policies/push_rule_policy.rb' - 'ee/app/policies/saml_provider_policy.rb' - 'ee/app/policies/timelog_policy.rb' - 'ee/app/policies/vulnerability_policy.rb' diff --git a/app/assets/javascripts/boards/components/board_add_new_column.vue b/app/assets/javascripts/boards/components/board_add_new_column.vue index bec6365bf34..3c7c792b787 100644 --- a/app/assets/javascripts/boards/components/board_add_new_column.vue +++ b/app/assets/javascripts/boards/components/board_add_new_column.vue @@ -30,7 +30,7 @@ export default { }, computed: { ...mapState(['labels', 'labelsLoading']), - ...mapGetters(['getListByLabelId', 'shouldUseGraphQL', 'isEpicBoard']), + ...mapGetters(['getListByLabelId', 'shouldUseGraphQL']), selectedLabel() { if (!this.selectedId) { return null; @@ -47,7 +47,7 @@ export default { methods: { ...mapActions(['createList', 'fetchLabels', 'highlightList', 'setAddColumnFormVisibility']), highlight(listId) { - if (this.shouldUseGraphQL || this.isEpicBoard) { + if (this.shouldUseGraphQL) { this.highlightList(listId); } else { const list = boardsStore.state.lists.find(({ id }) => id === listId); @@ -70,7 +70,7 @@ export default { return; } - if (this.shouldUseGraphQL || this.isEpicBoard) { + if (this.shouldUseGraphQL) { this.createList({ labelId: this.selectedId }); } else { const listObj = { @@ -118,13 +118,17 @@ export default {