diff --git a/ee/app/controllers/projects/dependencies_controller.rb b/ee/app/controllers/projects/dependencies_controller.rb index 4fce7630eaa522a633bf08a55c28f3e74b32db95..becb5ef0520e608caee8f19642aa793c659e6007 100644 --- a/ee/app/controllers/projects/dependencies_controller.rb +++ b/ee/app/controllers/projects/dependencies_controller.rb @@ -5,7 +5,8 @@ module Projects before_action :check_feature_enabled! def check_feature_enabled! - render_404 unless project.feature_available?(:dependency_list) + render_404 unless ::Feature.enabled?(:dependency_list) && + project.feature_available?(:dependency_list) end end end diff --git a/ee/app/controllers/projects/security/dependencies_controller.rb b/ee/app/controllers/projects/security/dependencies_controller.rb index d64080586f7a1e58da05f7b0567d67548a1d987a..2c60818a74f48dea59a17158c93de46ec6af75b5 100644 --- a/ee/app/controllers/projects/security/dependencies_controller.rb +++ b/ee/app/controllers/projects/security/dependencies_controller.rb @@ -28,7 +28,8 @@ module Projects end def ensure_dependency_list_feature_available - render_404 unless project.feature_available?(:dependency_list) + render_404 unless ::Feature.enabled?(:dependency_list) && + project.feature_available?(:dependency_list) end def dependencies diff --git a/ee/app/models/ee/ci/build.rb b/ee/app/models/ee/ci/build.rb index b5509e2e68773d9f2ce0639c4921404b6c866c54..723be1a0b8059d0b4cd22398fdbc76f05f6536db 100644 --- a/ee/app/models/ee/ci/build.rb +++ b/ee/app/models/ee/ci/build.rb @@ -81,7 +81,7 @@ module EE end def collect_dependency_list_reports!(dependency_list_report) - if project.feature_available?(:dependency_list) + if ::Feature.enabled?(:dependency_list) && project.feature_available?(:dependency_list) dependency_list = ::Gitlab::Ci::Parsers::Security::DependencyList.new(project, sha) each_report(::Ci::JobArtifact::DEPENDENCY_LIST_REPORT_FILE_TYPES) do |file_type, blob| diff --git a/ee/app/views/projects/sidebar/_dependencies.html.haml b/ee/app/views/projects/sidebar/_dependencies.html.haml index 4eb1724bf7582993684045eaae08916dc8af8e6a..4bf21ad17fe28bc6129932fc3ff124a993028df3 100644 --- a/ee/app/views/projects/sidebar/_dependencies.html.haml +++ b/ee/app/views/projects/sidebar/_dependencies.html.haml @@ -1,4 +1,4 @@ -- if @project.feature_available?(:dependency_list) +- if ::Feature.enabled?(:dependency_list) && @project.feature_available?(:dependency_list) = nav_link(path: 'projects/dependencies#show') do = link_to project_dependencies_path(@project), title: _('Dependency List'), class: 'shortcuts-project-dependencies' do %span= _('Dependency List')