Skip to content

Backport: Fix regex to support optional end line of old section in diff hunk #5097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Oct 18, 2018
Merged

Backport: Fix regex to support optional end line of old section in diff hunk #5097

merged 1 commit into from
Oct 18, 2018

Conversation

@kolaente
Copy link
Member

@kolaente kolaente commented Oct 17, 2018

See #5096

@kolaente
Fix regex to support optional end line of old section in diff hunk
d36f3d2 
+ Named groups in reges for easier group parsing
@kolaente kolaente mentioned this pull request Oct 17, 2018
Merged
@techknowlogick techknowlogick added this to the 1.6.0 milestone Oct 17, 2018
@techknowlogick
Copy link
Member

techknowlogick commented Oct 17, 2018

@kolaente thanks for making backport PR. In future please wait for original PR to be accepted (in case of changes).

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 17, 2018
@bkcsoft bkcsoft added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 17, 2018
@bkcsoft bkcsoft added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 17, 2018
@lunny lunny merged commit 49d666f into go-gitea:release/v1.6 Oct 18, 2018
@kolaente kolaente deleted the 1.6/hotfix/pr-diff-cutting branch January 24, 2019 18:16
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lafriks lafriks lafriks approved these changes

+1 more reviewer

@jonasfranz jonasfranz jonasfranz approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Milestone

1.6.0

Development

Successfully merging this pull request may close these issues.

6 participants

@kolaente @techknowlogick @lafriks @jonasfranz @lunny @bkcsoft