summaryrefslogtreecommitdiff
path: root/lib/gitlab.rb
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-08-28 01:29:53 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-08-28 01:29:53 +0000
commit0b563f8782c8a57d4b382b5b706b68bd431accad (patch)
treec4c864a0eb29b66d9ab6af98fdee8867ea5a6306 /lib/gitlab.rb
parent6308c0ab0f7f4001bb644071495811120b5be5e3 (diff)
parentfa674fa5e624a2bae7bc07ab28df0ede4edfef36 (diff)
downloadgitlab-ce-0b563f8782c8a57d4b382b5b706b68bd431accad.tar.gz
Merge branch 'ce-refactor-dev-org-com-helper' into 'master'
Rename dev, org, com helper See merge request gitlab-org/gitlab-ce!32115
Diffstat (limited to 'lib/gitlab.rb')
-rw-r--r--lib/gitlab.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index d9d8dcf7900..e8b938e46b1 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -55,7 +55,7 @@ module Gitlab
SUBDOMAIN_REGEX === Gitlab.config.gitlab.url
end
- def self.dev_env_or_com?
+ def self.dev_env_org_or_com?
Rails.env.development? || org? || com?
end