summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-02 09:09:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-02 09:09:24 +0000
commit0ce0b7bc5d8f9b88811a382c830cd13f2d38247d (patch)
treeb4dfd67379c929fcb835a1418a480afbf46b0a01
parent86c8477c26967f20eaecef8782ae2e23507df3cd (diff)
downloadgitlab-ce-0ce0b7bc5d8f9b88811a382c830cd13f2d38247d.tar.gz
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--lib/rspec_flaky/report.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rspec_flaky/report.rb b/lib/rspec_flaky/report.rb
index c7860f35f62..393ba3ae9f7 100644
--- a/lib/rspec_flaky/report.rb
+++ b/lib/rspec_flaky/report.rb
@@ -19,7 +19,7 @@ module RspecFlaky
end
def self.load_json(json)
- new(RspecFlaky::FlakyExamplesCollection.new(Gitlab::Json.parse(json)))
+ new(RspecFlaky::FlakyExamplesCollection.new(JSON.parse(json)))
end
def initialize(flaky_examples)