diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 11:42:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-31 11:42:44 +0000 |
| commit | 15c040a6bd71894260b66a90685070c0babfee76 (patch) | |
| tree | 27021108f64428697744973cddaede55930f4ef7 /config | |
| parent | 6e4e4023b46c786a99e1cfe8832fa5eff2728e0d (diff) | |
| download | gitlab-ce-15c040a6bd71894260b66a90685070c0babfee76.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@13-12-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/lograge.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |