summaryrefslogtreecommitdiff
path: root/lib/gitlab_edition.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-03 06:07:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-03 06:07:06 +0000
commita3759fc2e1f8aa1493840ab0d4ebd4a2e5f495aa (patch)
treefb8f046819669955006fe21043bfcc13dbe40209 /lib/gitlab_edition.rb
parent336483a4c150a112e83d95538218c59d9a952768 (diff)
downloadgitlab-ce-a3759fc2e1f8aa1493840ab0d4ebd4a2e5f495aa.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab_edition.rb')
-rw-r--r--lib/gitlab_edition.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab_edition.rb b/lib/gitlab_edition.rb
index c3e58852498..2a668537534 100644
--- a/lib/gitlab_edition.rb
+++ b/lib/gitlab_edition.rb
@@ -49,7 +49,7 @@ module GitlabEdition
# The behavior needs to be synchronised with
# config/helpers/is_ee_env.js
root.join('ee/app/models/license.rb').exist? &&
- !%w[true 1].include?(ENV['FOSS_ONLY'].to_s)
+ !%w[true 1].include?(ENV['FOSS_ONLY'].to_s) # rubocop:disable Rails/NegateInclude
end
def self.jh?
@@ -58,7 +58,7 @@ module GitlabEdition
@is_jh =
ee? &&
root.join('jh').exist? &&
- !%w[true 1].include?(ENV['EE_ONLY'].to_s)
+ !%w[true 1].include?(ENV['EE_ONLY'].to_s) # rubocop:disable Rails/NegateInclude
end
def self.ee