Merge branch 'revert-ab92e39b' into 'master'

Revert "Merge branch 'dependency-list-feature-flag-disabled-by-default' into 'master'"

See merge request gitlab-org/gitlab-ee!14253

ee/app/controllers/projects/dependencies_controller.rb

@@ -5,8 +5,7 @@ module Projects
     before_action :check_feature_enabled!
 
     def check_feature_enabled!
-      render_404 unless ::Feature.enabled?(:dependency_list) &&
-        project.feature_available?(:dependency_list)
+      render_404 unless project.feature_available?(:dependency_list)
     end
   end
 end

ee/app/controllers/projects/security/dependencies_controller.rb

@@ -32,8 +32,7 @@ module Projects
       end
 
       def ensure_dependency_list_feature_available
-        render_404 unless ::Feature.enabled?(:dependency_list) &&
-          project.feature_available?(:dependency_list)
+        render_404 unless project.feature_available?(:dependency_list)
       end
 
       def dependencies

ee/app/models/ee/ci/build.rb

@@ -81,7 +81,7 @@ module EE
       end
 
       def collect_dependency_list_reports!(dependency_list_report)
-        if ::Feature.enabled?(:dependency_list) && project.feature_available?(:dependency_list)
+        if 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|

ee/app/views/projects/sidebar/_dependencies.html.haml

-- if ::Feature.enabled?(:dependency_list) && @project.feature_available?(:dependency_list)
+- if @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')