diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-01 03:09:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-01 03:09:59 +0300 |
| commit | 3795b229ab9d63846002ebb9b95073c3cbf5ab98 (patch) | |
| tree | cb407d4e4d2d6a1b2f1f3f5850dccfe423eed302 /spec/lib/gitlab/grape_logging | |
| parent | 3aeda4e6146bea1920c3283e98b01ca4fcf796a8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/grape_logging')
| -rw-r--r-- | spec/lib/gitlab/grape_logging/formatters/lograge_with_timestamp_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/grape_logging/formatters/lograge_with_timestamp_spec.rb b/spec/lib/gitlab/grape_logging/formatters/lograge_with_timestamp_spec.rb index d3b108f60ff..84f23bb2ad9 100644 --- a/spec/lib/gitlab/grape_logging/formatters/lograge_with_timestamp_spec.rb +++ b/spec/lib/gitlab/grape_logging/formatters/lograge_with_timestamp_spec.rb @@ -30,7 +30,7 @@ describe Gitlab::GrapeLogging::Formatters::LogrageWithTimestamp do } end let(:time) { Time.now } - let(:result) { JSON.parse(subject) } + let(:result) { Gitlab::Json.parse(subject) } subject { described_class.new.call(:info, time, nil, log_entry) } |