diff options
| -rw-r--r-- | lib/gitlab.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 37ce01925bb..eaf6b208128 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -3,14 +3,19 @@ require_dependency 'gitlab/git' module Gitlab COM_URL = 'https://gitlab.com'.freeze APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))} + SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z} def self.com? - # Check `staging?` as well to keep parity with gitlab.com - Gitlab.config.gitlab.url == COM_URL || staging? + # Check `gl_subdomain?` as well to keep parity with gitlab.com + Gitlab.config.gitlab.url == COM_URL || gl_subdomain? end - def self.staging? - Gitlab.config.gitlab.url == 'https://staging.gitlab.com' + def self.gl_subdomain? + SUBDOMAIN_REGEX === Gitlab.config.gitlab.url + end + + def self.dev_env_or_com? + Rails.env.test? || Rails.env.development? || com? end def self.dev? @@ -18,6 +23,6 @@ module Gitlab end def self.inc_controlled? - dev? || staging? || com? + dev? || com? end end |