Backport GitLab domain helper methods
This commit is contained in:
parent
3a1b961dfa
commit
2c8d4f1a45
|
@ -1,5 +1,5 @@
|
||||||
deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
|
deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
|
||||||
|
|
||||||
if Gitlab.inc_controlled? || Rails.env.development?
|
if Gitlab.com? || Rails.env.development?
|
||||||
ActiveSupport::Deprecation.deprecate_methods(Gitlab::GitalyClient::StorageSettings, :legacy_disk_path, deprecator: deprecator)
|
ActiveSupport::Deprecation.deprecate_methods(Gitlab::GitalyClient::StorageSettings, :legacy_disk_path, deprecator: deprecator)
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,21 +3,18 @@ require_dependency 'gitlab/git'
|
||||||
module Gitlab
|
module Gitlab
|
||||||
COM_URL = 'https://gitlab.com'.freeze
|
COM_URL = 'https://gitlab.com'.freeze
|
||||||
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
|
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
|
||||||
|
SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
|
||||||
|
|
||||||
def self.com?
|
def self.com?
|
||||||
# Check `staging?` as well to keep parity with gitlab.com
|
# Check `gl_subdomain?` as well to keep parity with gitlab.com
|
||||||
Gitlab.config.gitlab.url == COM_URL || staging?
|
Gitlab.config.gitlab.url == COM_URL || gl_subdomain?
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.staging?
|
def self.gl_subdomain?
|
||||||
Gitlab.config.gitlab.url == 'https://staging.gitlab.com'
|
SUBDOMAIN_REGEX === Gitlab.config.gitlab.url
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.dev?
|
def self.dev_env_or_com?
|
||||||
Gitlab.config.gitlab.url == 'https://dev.gitlab.org'
|
Rails.env.test? || Rails.env.development? || com?
|
||||||
end
|
|
||||||
|
|
||||||
def self.inc_controlled?
|
|
||||||
dev? || staging? || com?
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,6 +14,12 @@ describe Gitlab do
|
||||||
expect(described_class.com?).to eq true
|
expect(described_class.com?).to eq true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'is true when on other gitlab subdomain' do
|
||||||
|
stub_config_setting(url: 'https://example.gitlab.com')
|
||||||
|
|
||||||
|
expect(described_class.com?).to eq true
|
||||||
|
end
|
||||||
|
|
||||||
it 'is false when not on GitLab.com' do
|
it 'is false when not on GitLab.com' do
|
||||||
stub_config_setting(url: 'http://example.com')
|
stub_config_setting(url: 'http://example.com')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue