Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
c53de19f
Commit
c53de19f
authored
Aug 03, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use serializable_hash for compared results
parent
c8f13cc5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-1
app/services/ci/compare_test_reports_service.rb
app/services/ci/compare_test_reports_service.rb
+1
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
c53de19f
...
...
@@ -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
...
...
app/services/ci/compare_test_reports_service.rb
View file @
c53de19f
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment