diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 21:09:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-30 21:09:38 +0300 |
| commit | 028bb5dda7abc9ec76f21ae8e691825b4673f733 (patch) | |
| tree | a41741811452f928c6f650451c69fc18e46b62a4 /spec/initializers | |
| parent | 7f305b576b51c3503970ef224cf4b31e247a322d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers')
| -rw-r--r-- | spec/initializers/lograge_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/initializers/lograge_spec.rb b/spec/initializers/lograge_spec.rb index 48acdac74ac..c243217d2a2 100644 --- a/spec/initializers/lograge_spec.rb +++ b/spec/initializers/lograge_spec.rb @@ -123,7 +123,7 @@ describe 'lograge', type: :request do let(:logger) do Logger.new(log_output).tap { |logger| logger.formatter = ->(_, _, _, msg) { msg } } end - let(:log_data) { JSON.parse(log_output.string) } + let(:log_data) { Gitlab::Json.parse(log_output.string) } before do Lograge.logger = logger |