From 15c040a6bd71894260b66a90685070c0babfee76 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 31 May 2021 11:42:18 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee --- config/initializers/lograge.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index e8479bc6aa4..61e357808d9 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -18,6 +18,7 @@ unless Gitlab::Runtime.sidekiq? data[:db_duration_s] = Gitlab::Utils.ms_to_round_sec(data.delete(:db)) if data[:db] data[:view_duration_s] = Gitlab::Utils.ms_to_round_sec(data.delete(:view)) if data[:view] data[:duration_s] = Gitlab::Utils.ms_to_round_sec(data.delete(:duration)) if data[:duration] + data[:location] = Gitlab::Utils.removes_sensitive_data_from_url(data[:location]) if data[:location] # Remove empty hashes to prevent type mismatches # These are set to empty hashes in Lograge's ActionCable subscriber -- cgit v1.2.3