Commit 68f0aa53 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'Update-markup-in-merge_requests/invalid-haml-file' into 'master'

Update markup in merge_requests/invalid.html.haml

See merge request gitlab-org/gitlab!63186
parents f219c7c1 51b60a88
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
= render "projects/merge_requests/mr_box" = render "projects/merge_requests/mr_box"
.gl-alert.gl-alert-danger .gl-alert.gl-alert-danger
.gl-alert-container
= sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-content{ role: 'alert' }
%p %p
We cannot render this merge request properly because We cannot render this merge request properly because
- if @merge_request.for_fork? && !@merge_request.source_project - if @merge_request.for_fork? && !@merge_request.source_project
......
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