Parse conflict lines with CRLF endings correctly
What does this MR do and why?
When lines have CRLF endings, GitLab is not able to parse them correctly as we match the conflict markers after we delete the newline character. That only deletes the LF and keep the CR.
To fix it, we also delete the CR before we match the conflict markers.
How to set up and validate locally
Follow the steps in #365343 (closed).
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Related to #365343 (closed)
Merge request reports
Activity
changed milestone to %15.2
added backend customer devopscreate groupcode review sectiondev typebug labels
assigned to @patrickbajao
Suggested Reviewers (beta)
The individuals below may be good candidates to participate in the review based on various factors.
You can use slash commands in comments to quickly assign
/assign_reviewer @user1
.Suggested Reviewers @stanhu
,@smcgivern
,@rymai
,@mayra-cabrera
,@cablett
If you do not believe these suggestions are useful, please apply the label Bad Suggested Reviewer. You can also provide feedback for this feature on this issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/357923
.Automatically generated by Suggested Reviewers Bot - an experimental ML-based recommendation engine created by ~"group::applied ml".
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend Kassio Borges ( @kassio
) (UTC+1, 7 hours behind@patrickbajao
)Alexandru Croitor ( @acroitor
) (UTC+3, 5 hours behind@patrickbajao
)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger- Resolved by Sincheol (David) Kim
Hi @tvellishetty, can you please review this as backend reviewer?
requested review from @tvellishetty
mentioned in issue #365343 (closed)
Allure report
allure-report-publisher
generated test report!review-qa-blocking:
test report for 6d34ed5fexpand test summary
+---------------------------------------------------------------------------+ | suites summary | +----------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +----------------------+--------+--------+---------+-------+-------+--------+ | Version sanity check | 0 | 0 | 1 | 0 | 1 | ➖ | | Create | 23 | 0 | 2 | 23 | 25 | ❗ | | Plan | 47 | 0 | 1 | 47 | 48 | ❗ | | Manage | 37 | 0 | 2 | 39 | 39 | ❗ | | Verify | 12 | 0 | 1 | 12 | 13 | ❗ | | Secure | 2 | 0 | 0 | 2 | 2 | ❗ | | Configure | 0 | 0 | 1 | 0 | 1 | ➖ | | Protect | 2 | 0 | 0 | 2 | 2 | ❗ | | Package | 0 | 0 | 1 | 0 | 1 | ➖ | +----------------------+--------+--------+---------+-------+-------+--------+ | Total | 123 | 0 | 9 | 125 | 132 | ❗ | +----------------------+--------+--------+---------+-------+-------+--------+
- Resolved by Patrick Bajao
requested review from @dskim_gitlab and removed review request for @tvellishetty
@tvellishetty
, thanks for approving this merge request.This is the first time the merge request is approved. To ensure full test coverage, a new pipeline has been started.
For more info, please refer to the following links:
removed review request for @dskim_gitlab
- Resolved by Patrick Bajao
added 417 commits
-
8e556c56...271665ec - 416 commits from branch
master
- 6d34ed5f - Parse conflict lines with CRLF endings correctly
-
8e556c56...271665ec - 416 commits from branch
requested review from @dskim_gitlab
mentioned in commit 17fa4f9c
added workflowstaging-canary label
added workflowcanary label and removed workflowstaging-canary label
added workflowstaging label and removed workflowcanary label
added workflowproduction label and removed workflowstaging label
added workflowpost-deploy-db-production label and removed workflowproduction label
added releasedcandidate label
added releasedpublished label and removed releasedcandidate label
mentioned in merge request kubitus-project/kubitus-installer!1252 (merged)