diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-26 16:08:57 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-26 16:08:57 +0000 |
| commit | 5a4dabd0c9a58fbfc9ed103fa82bf84433756d27 (patch) | |
| tree | d5b7ca452b32874e5e68c34b4480b9ead21248c6 | |
| parent | 356a57c23d7cea516488f0b2998849ff79218504 (diff) | |
| parent | 18bf882cabe9b3e5e7f3008d6496b6a6e8ebe0d9 (diff) | |
| download | gitlab-ce-5a4dabd0c9a58fbfc9ed103fa82bf84433756d27.tar.gz | |
Merge branch '23661-lacking-padding-on-syntax-highlight-blocks-in-diff-comments' into 'master'
Resolve "Lacking padding on syntax highlight blocks in diff comments"
## What does this MR do?
Enforces horizontal padding on highlight block.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
There was no horizontal padding on diff comment highlight blocks.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23661
See merge request !7062
| -rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index 28aad3f4725..78aa9fb7391 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -1,5 +1,5 @@ / Side-by-side diff view -%div.text-file.diff-wrap-lines.code.file-content.js-syntax-highlight{ data: diff_view_data } +%div.text-file.diff-wrap-lines.code.js-syntax-highlight{ data: diff_view_data } %table - last_line = 0 - diff_file.parallel_diff_lines.each do |line| |