diff options
author | Rémy Coutable <remy@rymai.me> | 2018-04-16 11:22:55 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-04-16 11:22:55 +0300 |
commit | c3e26860be156314e733a6dfb986c91fc55766f5 (patch) | |
tree | 16d68e023908dd2297b9b4868e2071bded1b22dd /lib | |
parent | 37c8c97c22a66494257e13420ceac1e372b83abf (diff) | |
parent | 2c8d4f1a450f15ea7e5bd731c0149287ca8e4e73 (diff) |
Merge branch 'osw-backport-gl-subdomain-method' into 'master'
Backport GitLab domain helper methods
See merge request gitlab-org/gitlab-ce!18376
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab.rb | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 37ce01925bb..2526a870976 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -3,21 +3,18 @@ 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? - Gitlab.config.gitlab.url == 'https://dev.gitlab.org' - end - - def self.inc_controlled? - dev? || staging? || com? + def self.dev_env_or_com? + Rails.env.test? || Rails.env.development? || com? end end |