diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-04-18 17:24:05 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-04-24 23:29:44 +0300 |
| commit | 132f7d33a92d69b163ed5c8a8d8dfd394da12a26 (patch) | |
| tree | 4f68819700e0659798a0823a9259eeddb8f35ef3 | |
| parent | 87cdd43b5dff255a8e1bccb23bcc90ddb9156f61 (diff) | |
Backport dev env check for storage settings deprecation
| -rw-r--r-- | config/initializers/deprecations.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/deprecations.rb b/config/initializers/deprecations.rb index f3f47b2ccf0..2476ea9e38a 100644 --- a/config/initializers/deprecations.rb +++ b/config/initializers/deprecations.rb @@ -1,5 +1,5 @@ deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab') -if Gitlab.com? || Rails.env.development? +if Gitlab.dev_env_or_com? ActiveSupport::Deprecation.deprecate_methods(Gitlab::GitalyClient::StorageSettings, :legacy_disk_path, deprecator: deprecator) end diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 0a167104bf4..a759aa7da88 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -30,6 +30,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 |