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.

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

Update to HAML 6 #1426

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Update to HAML 6 #1426

merged 2 commits into from
Jan 16, 2025

Conversation

deivid-rodriguez
Copy link
Member

What was the end-user problem that led to this PR?

The problem was none. I just wanted to finish the upgrade of all our stack to latest versions.

What is your fix for the problem, implemented in this PR?

My fix is to upgrade HAML and take care of a couple of problems that showed up.

Supersedes #918.

@olleolleolle
Copy link
Member

Code changes look like they simplify for the reader.

Copy link
Collaborator

@tnir tnir left a comment

Choose a reason for hiding this comment

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

@deivid-rodriguez Thanks for following my progress.

While I am not able check all pages today, there is a small regression at the top page as below:

haml6

@deivid-rodriguez
Copy link
Member Author

Fixed, thank you!

deivid-rodriguez and others added 2 commits January 16, 2025 09:08
Analogous to the blog header one.
There were two issues:

* Pages using the two column layout were duplicating content. I
  identified the issue as related to the weird usage of `content_for`
  inside `wrap_layout`. I removed that because it was also making the
  template structure harder to follow.

* Sometimes HTML entities were not being properly interpreted. Fixed by
  switching to use `!=` in those cases.

Signed-off-by: Takuya Noguchi <[email protected]>
@deivid-rodriguez
Copy link
Member Author

I'll merge now, we can address anything else as follow ups!

@deivid-rodriguez deivid-rodriguez merged commit 1e99a26 into master Jan 16, 2025
3 checks passed
@deivid-rodriguez deivid-rodriguez deleted the haml-6 branch January 16, 2025 09:24
@tnir
Copy link
Collaborator

tnir commented Jan 16, 2025

@deivid-rodriguez Thanks for finishing up!

@deivid-rodriguez
Copy link
Member Author

@tnir Thanks for getting this started!

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.

3 participants