Skip to content

Website: (Re-)Include site-wide variables only where necessary #179

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
andrewdavidwong merged 2 commits into from
Jul 6, 2021
Merged

Website: (Re-)Include site-wide variables only where necessary #179

andrewdavidwong merged 2 commits into from
Jul 6, 2021

Conversation

@tokideveloper
Copy link
Contributor

@tokideveloper tokideveloper commented Jun 24, 2021

@tokideveloper tokideveloper mentioned this pull request Jun 24, 2021
Merged
@andrewdavidwong andrewdavidwong requested a review from marmarek June 24, 2021 15:32
@marmarek
Copy link
Member

marmarek commented Jun 29, 2021

PipelineRetry

@marmarek
Copy link
Member

marmarek commented Jun 29, 2021

TestDeploy

1 similar comment
@marmarek
Copy link
Member

marmarek commented Jun 29, 2021

TestDeploy

@qubesos-bot qubesos-bot requested a deployment to qa June 29, 2021 23:53 Abandoned
@marmarek
Copy link
Member

marmarek commented Jun 29, 2021

TestDeploy

@qubesos-bot qubesos-bot requested a deployment to qa June 29, 2021 23:54 Abandoned
@marmarek
Copy link
Member

marmarek commented Jun 29, 2021

TestDeploy

@qubesos-bot qubesos-bot had a problem deploying to qa June 29, 2021 23:54 Failure
@marmarek
Copy link
Member

marmarek commented Jun 29, 2021

TestDeploy

@qubesos-bot qubesos-bot had a problem deploying to qa June 29, 2021 23:56 Failure
@marmarek
Copy link
Member

marmarek commented Jun 29, 2021

(in context of QubesOS/qubes-issues#6747) @andrewdavidwong I can mark the deployment as failed, but setting actual failure reason doesn't work for some reason. Still, I think that's an improvement in the feedback here.

@andrewdavidwong
Copy link
Member

andrewdavidwong commented Jun 30, 2021

(in context of QubesOS/qubes-issues#6747) @andrewdavidwong I can mark the deployment as failed, but setting actual failure reason doesn't work for some reason. Still, I think that's an improvement in the feedback here.

It is. Thanks!

marmarek
marmarek approved these changes Jul 6, 2021
View reviewed changes
Copy link
Member

@marmarek marmarek left a comment

Choose a reason for hiding this comment

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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Approved as of 4bf20cde11abbf1edc4786f4be2d35818c62ba0a
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEnYWYU8Ll1fIX9iss8yiUvpaEk4oFAmDjpy8ACgkQ8yiUvpaE
k4rpuxAAr8KxOPPtQYJMC9IzHE7hc1mz5StHAu/QwgbhKTtama/IRF3mAqwrQmHS
5wGyF2nmQxcQI7nowbuN9JlqtGZzK1qHt2Qv0ONo/OVSfk+5GHyNkotkAGyMXuo7
2+4H5SuEoQ+33KuyLFJd/pKKuTAxUuUXQQEo4iEJzzJRZU3+wb4PmxJJfp7l8GFC
lAxGQHiTU0JUpbLUoNkLPBnlwFmjUJkYwguO/ip4OHcMSha/EJfSq1KRoPwp2U6H
lC7DgN3sI04pQ5576Ih9VoKXRhefK9aXkHST2/ZB1S4r62j5z3aFSSil+CJjlCVa
ooR38Ta+b6QwPF8cGigUxQqKqmbwyfkl7TkUvles0GGLx0LXXQiOVlNl8d+cgS2f
dJQpFhtALQFszRpTD830rPoUCZRr75Y6AW5c0AsSa8V5bHVBr8rpc1OKRJKmLH/6
8XqrAzceqgyTzF4o26W3wi2Mn4tCtJrQcBKCx6Rr1IFjU2JVnBnGacioMfimdJ9y
Z8Oq+bNEuKdbvUslYAyZ2L8pvyth2XBNCMhL4v+8vSy6INzeVHNCm/Sf0lPK39TK
JIWXxutgld5MKUjmAyqCYK+qGGF6HCIT6Rs9+mclG5LukWOJRJFb2CrWSNsMZbCM
wUkOm0AdCSAoFgG7QQTv6EYzKaYzqY6UkZLYKhAgzcX62X6gmwI=
=CSHe
-----END PGP SIGNATURE-----

@andrewdavidwong andrewdavidwong merged commit 022d85d into QubesOS:master Jul 6, 2021
@andrewdavidwong
Copy link
Member

andrewdavidwong commented Jul 6, 2021

Unfortunately, merging this PR has resulted in this:

screenshot-localhost_4000-2021 07 06-04_00_06

andrewdavidwong added a commit that referenced this pull request Jul 6, 2021
@andrewdavidwong
Revert "Website: (Re-)Include site-wide variables only where necessary"
82f510d 
This reverts commit 1ed15fe.

This commit breaks the "Downloads" page (and possibly others).
See #179 for details.
@andrewdavidwong
Copy link
Member

andrewdavidwong commented Jul 6, 2021

Reverted: 82f510d

@andrewdavidwong
Copy link
Member

andrewdavidwong commented Jul 6, 2021

I think it's because the comment lines that are indented by four spaces are being interpreted as a code block.

andrewdavidwong added a commit that referenced this pull request Jul 6, 2021
@andrewdavidwong
Unindent comments
03a7cff 
Comments indented by four spaces are interpreted as code blocks in
Markdown, which is not desired here. Fixes the problem reported in
#179 (comment)
@andrewdavidwong
Copy link
Member

andrewdavidwong commented Jul 6, 2021

Original commit reapplied and fixed by unindenting comments: 03a7cff

All good now.

@tokideveloper tokideveloper deleted the include-variables-only-if-necessary branch July 6, 2021 17:30
@tokideveloper
Copy link
Contributor Author

tokideveloper commented Jul 6, 2021

Thanks for finding and fixing the bug! It seems that I didn't test it thoroughly enough.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marmarek marmarek marmarek approved these changes

Assignees

@marmarek marmarek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Include variables.html only once per page

4 participants

@tokideveloper @marmarek @andrewdavidwong @qubesos-bot