Skip to content
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

Revert "Merge pull request #127 from creative-commoners/pulls/master/… #128

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Revert "Merge pull request #127 from creative-commoners/pulls/master/… #128

merged 1 commit into from
Dec 5, 2024

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Dec 5, 2024 •
edited
Loading

Issue #122

I used git revert to generate this PR

As far as I can tell, the different in number of files and line numbers from the merged PR is composer.lock from the commit "Bump twig/twig from 3.12.0 to 3.14.2" which shows twice in https://github.com/silverstripe/api.silverstripe.org/commits/master/

i.e. the composer.lock showing in the original PR diff was kind of weird

@emteknetnz
Revert "Merge pull request silverstripe#127 from creative-commoners/p…
9b6cbf8 
…ulls/master/migrate-to-gh-pages"

This reverts commit a3da87e, reversing
changes made to bfe0238.
@emteknetnz emteknetnz marked this pull request as draft December 5, 2024 00:32
@emteknetnz emteknetnz marked this pull request as ready for review December 5, 2024 00:53
@emteknetnz emteknetnz mentioned this pull request Dec 5, 2024
Closed
4 tasks
GuySartorelli
GuySartorelli approved these changes Dec 5, 2024
View reviewed changes
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should ideally add the favicon, fix the error page styling, and possibly a few other of the changes from that PR - but you're right to outright revert for now and we can look at those separately.

@GuySartorelli GuySartorelli merged commit b337539 into silverstripe:master Dec 5, 2024
7 checks passed
@GuySartorelli GuySartorelli deleted the pulls/master/revert branch December 5, 2024 00:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuySartorelli GuySartorelli GuySartorelli approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@emteknetnz @GuySartorelli