diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-04-26 14:23:36 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-04-26 14:23:36 +0900 |
| commit | 4eb67ccff350d181e60e4666e459a364cd36b064 (patch) | |
| tree | c2c3e606b364dc5f1eee3320cba9f8312be7e634 /lib/gitlab.rb | |
| parent | 0262ed904d293fba9ceb0e3d79f62ffe8e8a239f (diff) | |
| parent | 55f07cc32e7684b21e0c1662c70128df14c6abf7 (diff) | |
| download | gitlab-ce-4eb67ccff350d181e60e4666e459a364cd36b064.tar.gz | |
Merge branch 'master' into live-trace-v2
Diffstat (limited to 'lib/gitlab.rb')
| -rw-r--r-- | lib/gitlab.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 0a167104bf4..c5498d0da1a 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -1,4 +1,3 @@ -require_dependency 'settings' require_dependency 'gitlab/popen' module Gitlab @@ -30,6 +29,6 @@ module Gitlab end def self.dev_env_or_com? - Rails.env.test? || Rails.env.development? || org? || com? + Rails.env.development? || org? || com? end end |