Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 1 deletions

diff --git a/bin/feature-flag b/bin/feature-flag
index ba86df9c06c..c01fb67131b 100755
--- a/bin/feature-flag
+++ b/bin/feature-flag
@@ -181,6 +181,10 @@ class FeatureFlagOptionParser
         $stderr.puts "URL needs to start with https://"
       end
     end
+
+    def read_default_enabled(options)
+      TYPES.dig(options.type, :default_enabled)
+    end
   end
 end
 
@@ -226,7 +230,7 @@ class FeatureFlagCreator
       'rollout_issue_url' => options.rollout_issue_url,
       'group'             => options.group.to_s,
       'type'              => options.type.to_s,
-      'default_enabled'   => false
+      'default_enabled'   => FeatureFlagOptionParser.read_default_enabled(options)
     ).strip
   end