Backport dev env check for storage settings deprecation

This commit is contained in:
Oswaldo Ferreira 2018-04-18 11:24:05 -03:00
parent 87cdd43b5d
commit 132f7d33a9
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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