diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-09 15:32:02 +0000 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-09 15:32:02 +0000 |
commit | 35aca1dbcf5862e3335b8acba8b730b558382ca8 (patch) | |
tree | c0233530be65058cd335bc62160236ad0154258b /app/views | |
parent | a8fcaaf1bf27a2bcf20a0cde2546f0de7b73dced (diff) | |
parent | bea83d2579ca3b8ca48802f5c114cea60bce396e (diff) | |
download | gitlab-ce-35aca1dbcf5862e3335b8acba8b730b558382ca8.tar.gz |
Merge branch 'remove-heading-space-from-diff-content' into 'master'
Remove an extra leading space from diff paste data
## What does this MR do?
Remove an extra leading space from diff paste data.
## Are there points in the code the reviewer needs to double check?
I have checked the following three patterns.
* inline diff
* parallel diff
* blob preview
## Why was this MR needed?
Diff paste data contain an extra leading space.
So it need to remove an extra leading space manually from pasted diff data.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [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?
#14176
Closes #23899
See merge request !7133
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/diffs/_line.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_line.html.haml b/app/views/projects/diffs/_line.html.haml index 7042e9f1fc9..a3e4b5b777e 100644 --- a/app/views/projects/diffs/_line.html.haml +++ b/app/views/projects/diffs/_line.html.haml @@ -25,9 +25,9 @@ %a{href: "##{line_code}", data: { linenumber: link_text }} %td.line_content.noteable_line{ class: type, data: (diff_view_line_data(line_code, diff_file.position(line), type) unless plain) }< - if email - %pre= diff_line_content(line.text, type) + %pre= diff_line_content(line.text) - else - = diff_line_content(line.text, type) + = diff_line_content(line.text) - discussions = local_assigns.fetch(:discussions, nil) - if discussions && !line.meta? |