c5fd3d5be9
Trim extra displayed carriage returns in diffs and files with CRLFs ## What does this MR do? This MR strips out extra carriage returns at the end of each tokenized string. ## Are there points in the code the reviewer needs to double check? Does this remove more than we need? ## Why was this MR needed? Windows users would see extra lines in their files. Newline characters are already added with every line in the HTML formatter. ## What are the relevant issue numbers? #20440, gitlab-com/support-forum#892, #20468 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5588 |
||
|---|---|---|
| .. | ||
| api | ||
| gitlab_stubs | ||
| import_export | ||
| matchers | ||
| api_helpers.rb | ||
| capybara.rb | ||
| capybara_helpers.rb | ||
| carrierwave.rb | ||
| db_cleaner.rb | ||
| email_format_shared_examples.rb | ||
| email_helpers.rb | ||
| factory_girl.rb | ||
| fake_u2f_device.rb | ||
| filter_spec_helper.rb | ||
| fixture_helpers.rb | ||
| import_spec_helper.rb | ||
| issue_helpers.rb | ||
| issue_tracker_service_shared_example.rb | ||
| jira_service_helper.rb | ||
| login_helpers.rb | ||
| markdown_feature.rb | ||
| mentionable_shared_examples.rb | ||
| merge_request_helpers.rb | ||
| omni_auth.rb | ||
| project_hook_data_shared_example.rb | ||
| reference_parser_helpers.rb | ||
| repo_helpers.rb | ||
| select2_helper.rb | ||
| services_shared_context.rb | ||
| setup_builds_storage.rb | ||
| stub_configuration.rb | ||
| stub_gitlab_calls.rb | ||
| stub_gitlab_data.rb | ||
| taskable_shared_examples.rb | ||
| test_env.rb | ||
| wait_for_ajax.rb | ||
| webmock.rb | ||
| workhorse_helpers.rb | ||