Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 9 deletions

diff --git a/app/controllers/projects/security/configuration_controller.rb b/app/controllers/projects/security/configuration_controller.rb
index ee2e60b5a1a..abf564a00e1 100644
--- a/app/controllers/projects/security/configuration_controller.rb
+++ b/app/controllers/projects/security/configuration_controller.rb
@@ -24,11 +24,7 @@ module Projects
       private
 
       def configuration
-        if unify_configuration_enabled?
-          configuration_presenter
-        else
-          {}
-        end
+        configuration_presenter
       end
 
       def configuration_presenter
@@ -38,10 +34,6 @@ module Projects
       def presenter_attributes
         {}
       end
-
-      def unify_configuration_enabled?
-        Feature.enabled?(:unify_security_configuration, project)
-      end
     end
   end
 end