Add latest changes from gitlab-org/gitlab@master

2 files changed, 20 insertions, 15 deletions

diff --git a/lib/feature.rb b/lib/feature.rb
index 71241e98723..1f8c530bee5 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -138,7 +138,7 @@ class Feature
     def register_definitions
       return unless check_feature_flags_definition?
 
-      Feature::Definition.load_all!
+      Feature::Definition.reload!
     end
 
     def register_hot_reloader
diff --git a/lib/feature/definition.rb b/lib/feature/definition.rb
index ee779a86952..0ba1bdc4799 100644
--- a/lib/feature/definition.rb
+++ b/lib/feature/definition.rb
@@ -84,17 +84,14 @@ class Feature
       end
 
       def definitions
-        @definitions ||= {}
+        # We lazily load all definitions
+        # The hot reloading might request a feature flag
+        # before we can properly call `load_all!`
+        @definitions ||= load_all!
       end
 
-      def load_all!
-        definitions.clear
-
-        paths.each do |glob_path|
-          load_all_from_path!(glob_path)
-        end
-
-        definitions
+      def reload!
+        @definitions = load_all!
       end
 
       def valid_usage!(key, type:, default_enabled:)
@@ -110,9 +107,7 @@ class Feature
       def register_hot_reloader!
         # Reload feature flags on change of this file or any `.yml`
         file_watcher = Rails.configuration.file_watcher.new(reload_files, reload_directories) do
-          # We use `Feature::Definition` as on Ruby code-reload
-          # a new class definition is created
-          Feature::Definition.load_all!
+          Feature::Definition.reload!
         end
 
         Rails.application.reloaders << file_watcher
@@ -123,6 +118,16 @@ class Feature
 
       private
 
+      def load_all!
+        # We currently do not load feature flag definitions
+        # in production environments
+        return [] unless Gitlab.dev_or_test_env?
+
+        paths.each_with_object({}) do |glob_path, definitions|
+          load_all_from_path!(definitions, glob_path)
+        end
+      end
+
       def load_from_file(path)
         definition = File.read(path)
         definition = YAML.safe_load(definition)
@@ -133,7 +138,7 @@ class Feature
         raise Feature::InvalidFeatureFlagError, "Invalid definition for `#{path}`: #{e.message}"
       end
 
-      def load_all_from_path!(glob_path)
+      def load_all_from_path!(definitions, glob_path)
         Dir.glob(glob_path).each do |path|
           definition = load_from_file(path)
 
@@ -146,7 +151,7 @@ class Feature
       end
 
       def reload_files
-        [File.expand_path(__FILE__)]
+        []
       end
 
       def reload_directories