diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 16:26:31 +0300 |
commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /lib/gitlab.rb | |
parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab.rb')
-rw-r--r-- | lib/gitlab.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 582541c0679..b337f5cbf2c 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -56,7 +56,11 @@ module Gitlab end def self.dev_env_org_or_com? - Rails.env.development? || org? || com? + dev_env_or_com? || org? + end + + def self.dev_env_or_com? + Rails.env.development? || com? end def self.ee? |