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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: fix pkgdown config for rotemplate compatibility #173

Merged
merged 2 commits into from Apr 9, 2023
Merged

Conversation

maelle
Copy link
Member

@maelle maelle commented Apr 6, 2023

馃憢 @jonkeane

I noticed that on https://docs.ropensci.org/dittodb/ the navbar has duplicated content.

With the config in this PR, I think you get the right navbar for both your own pkgdown docs and for the rOpenSci branded ones. Screenshots below.

image
image

@maelle maelle requested a review from jonkeane April 6, 2023 10:03
@maelle
Copy link
Member Author

maelle commented Apr 6, 2023

oops, reconverting to draft whilst I fix the news part!

@maelle maelle marked this pull request as draft April 6, 2023 10:04
@maelle maelle marked this pull request as ready for review April 6, 2023 10:10
@maelle
Copy link
Member Author

maelle commented Apr 6, 2023

How many more workflows could my PR break 馃檲

@jonkeane
Copy link
Collaborator

jonkeane commented Apr 6, 2023

How many more workflows could my PR break 馃檲

These aren't your fault! I just merged a PR that fixes these (long story, but a change to dbply query construction showed off a bug I had). If you rebase this branch, it should work (or I can do that for you if you don't mind me pushing to your branch...)

@jonkeane
Copy link
Collaborator

jonkeane commented Apr 6, 2023

And thank you for the PR! I'm about to do a CRAN release as well, so this is fortuitous timing

@maelle
Copy link
Member Author

maelle commented Apr 6, 2023

I don't mind your rebasing my PR! I see the PRs here don't have the buttons to allow rebasing from GitHub interface by the way.

@jonkeane
Copy link
Collaborator

jonkeane commented Apr 6, 2023

I see the PRs here don't have the buttons to allow rebasing from GitHub interface by the way.

Hmmm is there a setting to enable that?

@maelle
Copy link
Member Author

maelle commented Apr 6, 2023

Yes, the checkbox at the bottom of this screenshot:

image

@maelle
Copy link
Member Author

maelle commented Apr 6, 2023

btw as you see you can also change the default message when merging, it can be useful too.

@jonkeane
Copy link
Collaborator

jonkeane commented Apr 6, 2023

Hmmm interesting those were already checked 馃

I did also enable "Always suggest updating pull request branches" which sounds like a good idea anyway

@jonkeane jonkeane merged commit df8d947 into main Apr 9, 2023
24 checks passed
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.

None yet

2 participants