Backport dev env check for storage settings deprecation

132f7d33 · Oswaldo Ferreira · 87cdd43b · 132f7d33 · 132f7d33
Commit 132f7d33 authored Apr 18, 2018 by Oswaldo Ferreira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

config/initializers/deprecations.rb config/initializers/deprecations.rb +1 -1

lib/gitlab.rb lib/gitlab.rb +1 -1

No files found.
--- a/config/initializers/deprecations.rb
+++ b/config/initializers/deprecations.rb
 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
--- 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