diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /scripts/used-feature-flags | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'scripts/used-feature-flags')
-rwxr-xr-x | scripts/used-feature-flags | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/used-feature-flags b/scripts/used-feature-flags index 7d81e4b2cb2..552adbfbd9f 100755 --- a/scripts/used-feature-flags +++ b/scripts/used-feature-flags @@ -3,6 +3,7 @@ require 'set' require 'fileutils' +require_relative 'lib/gitlab' class String def red @@ -27,8 +28,7 @@ flags_paths = [ ] # For EE additionally process `ee/` feature flags -is_ee = File.exist?('ee/app/models/license.rb') && !%w[true 1].include?(ENV['FOSS_ONLY'].to_s) -if is_ee +if Gitlab.ee? flags_paths << 'ee/config/feature_flags/**/*.yml' # Geo feature flags are constructed dynamically and there's no explicit checks in the codebase so we mark all @@ -43,8 +43,7 @@ if is_ee end # For JH additionally process `jh/` feature flags -is_jh = is_ee && Dir.exist?('jh') && !%w[true 1].include?(ENV['EE_ONLY'].to_s) -if is_jh +if Gitlab.jh? flags_paths << 'jh/config/feature_flags/**/*.yml' Dir.glob('jh/app/replicators/geo/*_replicator.rb').each_with_object(Set.new) do |path, memo| |