diff --git a/ee/app/assets/javascripts/dependencies/index.js b/ee/app/assets/javascripts/dependencies/index.js index c00a54c6a546f0eb8c30995a9902293a5564544d..e26ed7f089da2fa4633d957680c00a6aed666871 100644 --- a/ee/app/assets/javascripts/dependencies/index.js +++ b/ee/app/assets/javascripts/dependencies/index.js @@ -1,8 +1,6 @@ import Vue from 'vue'; import DependenciesApp from './components/app.vue'; import createStore from './store'; -import { DEPENDENCY_LIST_TYPES } from './store/constants'; -import { addListType } from './store/utils'; export default () => { const el = document.querySelector('#js-dependencies-app'); @@ -10,10 +8,6 @@ export default () => { const store = createStore(); - if (!gon.features?.dependencyListUi) { - addListType(store, DEPENDENCY_LIST_TYPES.vulnerable); - } - return new Vue({ el, store, diff --git a/ee/app/assets/javascripts/dependencies/store/constants.js b/ee/app/assets/javascripts/dependencies/store/constants.js index aacbc63f285f52a878a5d5a3145aadd4480dadda..908bef147b37648058d10f3c79bf563d2c84e5a8 100644 --- a/ee/app/assets/javascripts/dependencies/store/constants.js +++ b/ee/app/assets/javascripts/dependencies/store/constants.js @@ -10,6 +10,8 @@ export const DEPENDENCY_LIST_TYPES = { filter: FILTER.all, }, }, + // This is only used in tests, and will be removed in + // https://gitlab.com/gitlab-org/gitlab/-/issues/217734 vulnerable: { namespace: 'vulnerableDependencies', label: s__('Dependencies|Vulnerable components'), diff --git a/ee/app/controllers/projects/dependencies_controller.rb b/ee/app/controllers/projects/dependencies_controller.rb index a9aa10c364c1e54051c4f5f0946d73ce834025a5..8e92aaf9c92efb7e6fdc7b04e010534edc79ee21 100644 --- a/ee/app/controllers/projects/dependencies_controller.rb +++ b/ee/app/controllers/projects/dependencies_controller.rb @@ -4,10 +4,6 @@ module Projects class DependenciesController < Projects::ApplicationController before_action :authorize_read_dependency_list! - before_action only: [:index] do - push_frontend_feature_flag(:dependency_list_ui, project, default_enabled: true) - end - def index respond_to do |format| format.html do