diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-03 22:23:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-03 22:23:33 +0000 |
| commit | 6c3124c854cbeef391a38b5ae8330174d78348bf (patch) | |
| tree | af77629bc34ccc517ed24d9db35895be5d02d23d /lib/gitlab/usage/service_ping_report.rb | |
| parent | 9a8ae3b4e90e56f71bb770463b943512efdcd1d1 (diff) | |
| download | gitlab-ce-6c3124c854cbeef391a38b5ae8330174d78348bf.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-0-stable-ee
Diffstat (limited to 'lib/gitlab/usage/service_ping_report.rb')
| -rw-r--r-- | lib/gitlab/usage/service_ping_report.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/usage/service_ping_report.rb b/lib/gitlab/usage/service_ping_report.rb index e73200cbd4a..1eda72ba570 100644 --- a/lib/gitlab/usage/service_ping_report.rb +++ b/lib/gitlab/usage/service_ping_report.rb @@ -24,7 +24,7 @@ module Gitlab instrumented_payload = Gitlab::Usage::ServicePing::InstrumentedPayload.new(instrumented_metrics_key_paths, output_method).build - old_payload.deep_merge(instrumented_payload) + old_payload.with_indifferent_access.deep_merge(instrumented_payload) end def all_metrics_values(cached) |