Commit 067ab0e3 authored by Mark Florian's avatar Mark Florian

Rely on feature flags being disabled by default

parent 35097265
...@@ -5,7 +5,7 @@ module Projects ...@@ -5,7 +5,7 @@ module Projects
before_action :check_feature_enabled! before_action :check_feature_enabled!
def check_feature_enabled! def check_feature_enabled!
render_404 unless ::Feature.enabled?(:dependency_list, default_enabled: false) && render_404 unless ::Feature.enabled?(:dependency_list) &&
project.feature_available?(:dependency_list) project.feature_available?(:dependency_list)
end end
end end
......
...@@ -28,7 +28,7 @@ module Projects ...@@ -28,7 +28,7 @@ module Projects
end end
def ensure_dependency_list_feature_available def ensure_dependency_list_feature_available
render_404 unless ::Feature.enabled?(:dependency_list, default_enabled: false) && render_404 unless ::Feature.enabled?(:dependency_list) &&
project.feature_available?(:dependency_list) project.feature_available?(:dependency_list)
end end
......
...@@ -81,8 +81,7 @@ module EE ...@@ -81,8 +81,7 @@ module EE
end end
def collect_dependency_list_reports!(dependency_list_report) def collect_dependency_list_reports!(dependency_list_report)
flag_enabled = ::Feature.enabled?(:dependency_list, default_enabled: false) if ::Feature.enabled?(:dependency_list) && project.feature_available?(:dependency_list)
if flag_enabled && project.feature_available?(:dependency_list)
dependency_list = ::Gitlab::Ci::Parsers::Security::DependencyList.new(project, sha) dependency_list = ::Gitlab::Ci::Parsers::Security::DependencyList.new(project, sha)
each_report(::Ci::JobArtifact::DEPENDENCY_LIST_REPORT_FILE_TYPES) do |file_type, blob| each_report(::Ci::JobArtifact::DEPENDENCY_LIST_REPORT_FILE_TYPES) do |file_type, blob|
......
- if ::Feature.enabled?(:dependency_list, default_enabled: false) && @project.feature_available?(:dependency_list) - if ::Feature.enabled?(:dependency_list) && @project.feature_available?(:dependency_list)
= nav_link(path: 'projects/dependencies#show') do = nav_link(path: 'projects/dependencies#show') do
= link_to project_dependencies_path(@project), title: _('Dependency List'), class: 'shortcuts-project-dependencies' do = link_to project_dependencies_path(@project), title: _('Dependency List'), class: 'shortcuts-project-dependencies' do
%span= _('Dependency List') %span= _('Dependency List')
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