diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/search | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/search')
| -rw-r--r-- | app/views/search/results/_blob_highlight.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/search/results/_blob_highlight.html.haml b/app/views/search/results/_blob_highlight.html.haml index 729eda331b5..7ba114496af 100644 --- a/app/views/search/results/_blob_highlight.html.haml +++ b/app/views/search/results/_blob_highlight.html.haml @@ -6,7 +6,7 @@ .blob-content{ data: { blob_id: blob.id, path: blob.path, highlight_line: highlight, qa_selector: 'file_content' } } - blob.present.highlight.lines.each_with_index do |line, index| - i = index + offset - .line_holder.code-search-line + .line_holder.code-search-line.gl-display-flex .line-numbers .gl-display-flex %span.diff-line-num.gl-pl-3 @@ -22,7 +22,7 @@ %a{ href: "#{blob_link}#L#{i}", id: "blob-L#{i}", 'data-line-number' => i, class: 'gl-display-flex! gl-align-items-center gl-justify-content-end' } = sprite_icon('link', css_class: 'gl-ml-3! gl-mr-1!') = i - %pre.code.highlight + %pre.code.highlight.flex-grow-1 %code = line.html_safe |