diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-25 08:31:32 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-25 08:31:32 +0000 |
| commit | e6f6f8e7a3af3cd577075d1ac9ce287867c3e429 (patch) | |
| tree | ba918ba2f4939e77eefb21e4befe62bfa39972e7 | |
| parent | 772b6b08dd7c97c8c145a57f524d60aaefc4eaef (diff) | |
| parent | 132f7d33a92d69b163ed5c8a8d8dfd394da12a26 (diff) | |
| download | gitlab-ce-e6f6f8e7a3af3cd577075d1ac9ce287867c3e429.tar.gz | |
Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' into 'master'
Backport dev env check for storage settings deprecation
See merge request gitlab-org/gitlab-ce!18461
| -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 9c9368a4f8d..c5498d0da1a 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -29,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 |