Merge branch 'sh-remove-deprecation-warnings-from-com' into 'master'

Conditionally enable deprecation log messages Closes #46158 and gitlab-com/infrastructure#4228 See merge request gitlab-org/gitlab-ce!18997

Merge branch 'sh-remove-deprecation-warnings-from-com' into 'master'
cc4f7ef4 · Mayra Cabrera · b605916f · cc4f7ef4
Commit cc4f7ef4 authored May 17, 2018 by Mayra Cabrera
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

deprecations.rb config/initializers/deprecations.rb +6 -2

No files found.
--- a/config/initializers/deprecations.rb
+++ b/config/initializers/deprecations.rb
-deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
+if Rails.env.development? || ENV['GITLAB_LEGACY_PATH_LOG_MESSAGE']
+  deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
+
+  deprecator.behavior = -> (message, callstack) {
+    Rails.logger.warn("#{message}: #{callstack[1..20].join}")
+  }

-if Gitlab.dev_env_or_com?
  ActiveSupport::Deprecation.deprecate_methods(Gitlab::GitalyClient::StorageSettings, :legacy_disk_path, deprecator: deprecator)
 end