Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-12 03:07:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-12 03:07:43 +0300
commit2e3cbf7d89815e2915f77677388c49b48f8d20c3 (patch)
tree03bdbc99e829295e8077b2ec4032300c15b48e37 /app/controllers/projects/error_tracking_controller.rb
parente44bb86539a8fb4cfb06dfe281632b6f206bd0a7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/error_tracking_controller.rb')
-rw-r--r--app/controllers/projects/error_tracking_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/error_tracking_controller.rb b/app/controllers/projects/error_tracking_controller.rb
index 56a66dd38db..ba21ccfb169 100644
--- a/app/controllers/projects/error_tracking_controller.rb
+++ b/app/controllers/projects/error_tracking_controller.rb
@@ -77,8 +77,10 @@ class Projects::ErrorTrackingController < Projects::ApplicationController
return if handle_errors(result)
+ result_with_syntax_highlight = Gitlab::ErrorTracking::StackTraceHighlightDecorator.decorate(result[:latest_event])
+
render json: {
- error: serialize_error_event(result[:latest_event])
+ error: serialize_error_event(result_with_syntax_highlight)
}
end