Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 0 deletions

diff --git a/bin/feature-flag b/bin/feature-flag
index 43e273be1fa..0de9b90681f 100755
--- a/bin/feature-flag
+++ b/bin/feature-flag
@@ -35,6 +35,7 @@ class FeatureFlagOptionParser
     :name,
     :type,
     :group,
+    :milestone,
     :ee,
     :amend,
     :dry_run,
@@ -64,6 +65,10 @@ class FeatureFlagOptionParser
           options.introduced_by_url = value
         end
 
+        opts.on('-M', '--milestone [string]', String, 'Milestone in which the Feature Flag was introduced') do |value|
+          options.milestone = value
+        end
+
         opts.on('-i', '--rollout-issue-url [string]', String, 'URL of Issue rolling out the Feature Flag') do |value|
           options.rollout_issue_url = value
         end
@@ -188,6 +193,11 @@ class FeatureFlagOptionParser
       end
     end
 
+    def read_milestone
+      milestone = File.read('VERSION')
+      milestone.gsub(/^(\d+\.\d+).*$/, '\1').chomp
+    end
+
     def read_default_enabled(options)
       TYPES.dig(options.type, :default_enabled)
     end
@@ -214,6 +224,7 @@ class FeatureFlagCreator
     options.group ||= FeatureFlagOptionParser.read_group
     options.introduced_by_url ||= FeatureFlagOptionParser.read_introduced_by_url
     options.rollout_issue_url ||= FeatureFlagOptionParser.read_rollout_issue_url(options)
+    options.milestone ||= FeatureFlagOptionParser.read_milestone
 
     $stdout.puts "\e[32mcreate\e[0m #{file_path}"
     $stdout.puts contents
@@ -243,6 +254,7 @@ class FeatureFlagCreator
       'name'              => options.name,
       'introduced_by_url' => options.introduced_by_url,
       'rollout_issue_url' => options.rollout_issue_url,
+      'milestone'         => options.milestone,
       'group'             => options.group,
       'type'              => options.type.to_s,
       'default_enabled'   => FeatureFlagOptionParser.read_default_enabled(options)