diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-28 12:08:40 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-28 12:08:40 +0000 |
commit | 24e7d185395af41290e5622cad160b7efe230145 (patch) | |
tree | 61c2c5d429caf996bb71c2b617273c04e7946218 /bin | |
parent | a2ee63d924727701913f1fc9572f1182f40fda23 (diff) | |
download | gitlab-ce-24e7d185395af41290e5622cad160b7efe230145.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/feature-flag | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/feature-flag b/bin/feature-flag index b5e7889be1d..43e273be1fa 100755 --- a/bin/feature-flag +++ b/bin/feature-flag @@ -126,6 +126,8 @@ class FeatureFlagOptionParser $stdout.puts ">> Specify the feature flag type:" $stdout.puts TYPES.each do |type, data| + next if data[:deprecated] + $stdout.puts "#{type.to_s.rjust(15)}#{' '*6}#{data[:description]}" end @@ -133,7 +135,7 @@ class FeatureFlagOptionParser $stdout.print "?> " type = $stdin.gets.strip.to_sym - return type if TYPES[type] + return type if TYPES[type] && !TYPES[type][:deprecated] $stderr.puts "Invalid type specified '#{type}'" end |