Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/feature/definition.rb b/lib/feature/definition.rb
index 8d9b2fa5234..cd2f5cb07a2 100644
--- a/lib/feature/definition.rb
+++ b/lib/feature/definition.rb
@@ -153,7 +153,7 @@ class Feature
         definition.deep_symbolize_keys!
 
         self.new(path, definition).tap(&:validate!)
-      rescue => e
+      rescue StandardError => e
         raise Feature::InvalidFeatureFlagError, "Invalid definition for `#{path}`: #{e.message}"
       end
 
@@ -185,4 +185,4 @@ class Feature
   end
 end
 
-Feature::Definition.prepend_if_ee('EE::Feature::Definition')
+Feature::Definition.prepend_mod_with('Feature::Definition')