Commit e8bab117 authored by André Luís's avatar André Luís

Fix _with_tabs.html.haml conflict

parent e0840556
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
%pre.build-trace.build-trace-rounded %pre.build-trace.build-trace-rounded
%code.bash.js-build-output %code.bash.js-build-output
= build_summary(build) = build_summary(build)
<<<<<<< HEAD
- if expose_sast_data || expose_dependency_data - if expose_sast_data || expose_dependency_data
#js-tab-security.build-security.tab-pane #js-tab-security.build-security.tab-pane
#js-security-report-app{ data: { endpoint: expose_sast_data ? sast_artifact_url(@pipeline) : nil, #js-security-report-app{ data: { endpoint: expose_sast_data ? sast_artifact_url(@pipeline) : nil,
...@@ -95,6 +94,3 @@ ...@@ -95,6 +94,3 @@
vulnerability_feedback_help_path: help_page_path("user/project/merge_requests/index", anchor: "interacting-with-security-reports-ultimate"), vulnerability_feedback_help_path: help_page_path("user/project/merge_requests/index", anchor: "interacting-with-security-reports-ultimate"),
sast_help_path: help_page_path('user/project/merge_requests/sast'), sast_help_path: help_page_path('user/project/merge_requests/sast'),
dependency_scanning_help_path: help_page_path('user/project/merge_requests/dependency_scanning')} } dependency_scanning_help_path: help_page_path('user/project/merge_requests/dependency_scanning')} }
=======
>>>>>>> upstream/master
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment