diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-08-03 17:31:03 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-08-03 17:31:03 +0900 |
| commit | c53de19ff8b8734d9924a261206318021c39a952 (patch) | |
| tree | d7d1d6a30d8681d30fb7835351fbb36d66741ed3 | |
| parent | c8f13cc5bd4fbd7b9e2bab1bdded73a080a29255 (diff) | |
| download | gitlab-ce-c53de19ff8b8734d9924a261206318021c39a952.tar.gz | |
Use serializable_hash for compared results
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
| -rw-r--r-- | app/services/ci/compare_test_reports_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 410fb92eb7c..eaf4434f913 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -108,7 +108,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo when :parsing render json: '', status: :no_content when :parsed - render json: result[:data], status: :ok + render json: result[:data].to_json, status: :ok when :error render json: { status_reason: result[:status_reason] }, status: :bad_request else diff --git a/app/services/ci/compare_test_reports_service.rb b/app/services/ci/compare_test_reports_service.rb index 8bc3354c403..248c9b364d2 100644 --- a/app/services/ci/compare_test_reports_service.rb +++ b/app/services/ci/compare_test_reports_service.rb @@ -14,7 +14,7 @@ module Ci status: :parsed, data: TestReportsComparerSerializer .new(project: project) - .represent(comparer).to_json + .represent(comparer).as_json } rescue => e { status: :error, status_reason: e.message } |