diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-03 09:07:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-03 09:07:06 +0300 |
| commit | a3759fc2e1f8aa1493840ab0d4ebd4a2e5f495aa (patch) | |
| tree | fb8f046819669955006fe21043bfcc13dbe40209 /scripts | |
| parent | 336483a4c150a112e83d95538218c59d9a952768 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/gitlab.rb | 4 | ||||
| -rwxr-xr-x | scripts/static-analysis | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/gitlab.rb b/scripts/lib/gitlab.rb index 556e2037edf..a7ca6b7c5df 100644 --- a/scripts/lib/gitlab.rb +++ b/scripts/lib/gitlab.rb @@ -4,10 +4,10 @@ module Gitlab module_function def ee? - File.exist?(File.expand_path('../../ee/app/models/license.rb', __dir__)) && !%w[true 1].include?(ENV['FOSS_ONLY'].to_s) + File.exist?(File.expand_path('../../ee/app/models/license.rb', __dir__)) && !%w[true 1].include?(ENV['FOSS_ONLY'].to_s) # rubocop:disable Rails/NegateInclude end def jh? - ee? && Dir.exist?(File.expand_path('../../jh', __dir__)) && !%w[true 1].include?(ENV['EE_ONLY'].to_s) + ee? && Dir.exist?(File.expand_path('../../jh', __dir__)) && !%w[true 1].include?(ENV['EE_ONLY'].to_s) # rubocop:disable Rails/NegateInclude end end diff --git a/scripts/static-analysis b/scripts/static-analysis index c6cf09e056b..a346675099a 100755 --- a/scripts/static-analysis +++ b/scripts/static-analysis @@ -134,7 +134,7 @@ class StaticAnalysis def warning_count(static_analysis) static_analysis.warned_results - .count { |result| !ALLOWED_WARNINGS.include?(result.stderr.strip) } + .count { |result| !ALLOWED_WARNINGS.include?(result.stderr.strip) } # rubocop:disable Rails/NegateInclude end def tasks_to_run(node_total) |