Add .org? method to Gitlab helper

dev_env_or_com? now considers dev.gitlab.org
This commit is contained in:
Oswaldo Ferreira 2018-04-17 11:21:03 -03:00
parent 08083f43cb
commit f39a7af0f7

View file

@ -10,11 +10,15 @@ module Gitlab
Gitlab.config.gitlab.url == COM_URL || gl_subdomain? Gitlab.config.gitlab.url == COM_URL || gl_subdomain?
end end
def self.org?
Gitlab.config.gitlab.url == 'https://dev.gitlab.org'
end
def self.gl_subdomain? def self.gl_subdomain?
SUBDOMAIN_REGEX === Gitlab.config.gitlab.url SUBDOMAIN_REGEX === Gitlab.config.gitlab.url
end end
def self.dev_env_or_com? def self.dev_env_or_com?
Rails.env.test? || Rails.env.development? || com? Rails.env.test? || Rails.env.development? || org? || com?
end end
end end