Skip to content

Update to upstream 1.2.11#13

Merged
j0k3r merged 2 commits intofossar:masterfrom
Kdecherf:backport/1.2.11
May 22, 2023
Merged

Update to upstream 1.2.11#13
j0k3r merged 2 commits intofossar:masterfrom
Kdecherf:backport/1.2.11

Conversation

@Kdecherf
Copy link

@Kdecherf Kdecherf commented Apr 7, 2023

I give up on keeping coding style because the original author refactored his file several times since our last upstream update and it's way to hard to keep our cs-fixer happy with it.

For this PR I took the htmLawed.php from the version 1.2.11 and manually applied back the following commits from our history:

Kdecherf added 2 commits April 7, 2023 21:07
I give up on keeping code style

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
It's hard to keep up with upstream when having different coding styles

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
@Kdecherf Kdecherf requested review from j0k3r and jtojnar April 7, 2023 19:16
@j0k3r
Copy link

j0k3r commented Apr 12, 2023

But the CS is still applied to the changes of the PR. You only removed the GitHub Actions not your changes.
Changes doesn't seems to reflect commits you mentioned in the description. 🤔

@Kdecherf
Copy link
Author

But the CS is still applied to the changes of the PR. You only removed the GitHub Actions not your changes. Changes doesn't seems to reflect commits you mentioned in the description.

Why are you thinking that the mentioned commits weren't applied in this PR?

@Kdecherf
Copy link
Author

@j0k3r
Copy link

j0k3r commented May 22, 2023

I can't remember why I said that..

@j0k3r j0k3r merged commit 8aa21f9 into fossar:master May 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants