Skip to content

refactor docs #1301

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

Merged
merged 1 commit into from
Jan 14, 2024
Merged

refactor docs #1301

merged 1 commit into from
Jan 14, 2024

Conversation

yuxiaoy1
Copy link
Contributor

@yuxiaoy1 yuxiaoy1 commented Jan 4, 2024

This PR made some code improvements in docs:

@pamelafox pamelafox changed the base branch from main to 3.1.x January 4, 2024 14:33
@pamelafox
Copy link
Contributor

The changes look good, thanks! I've edited the PR description to describe them. Per the contributing guide, these changes should be made in the 3.1.x branch:
https://github.com/pallets-eco/flask-sqlalchemy/blob/main/CONTRIBUTING.rst#start-coding
Can you fix this branch so its branched off there instead?

@yuxiaoy1
Copy link
Contributor Author

yuxiaoy1 commented Jan 4, 2024

Thank you, I see you've already change the branch to 3.1.x, what else do I need to do for merging the PR? @pamelafox

@pamelafox
Copy link
Contributor

It's confused since your branch still has all the main changes in it, can you replay your changes against 3.1? (Or rebase?)

@ThiefMaster
Copy link
Contributor

You need to git rebase --onto 3.1.x master and force-push. Just changing the target branch on GitHub is not enough.

{{ pagination.first }} - {{ pagination.last }} of {{ pagination.total }}
</div>
<div class=pagination>
<div class="pagination">
Copy link
Member

Choose a reason for hiding this comment

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

This change is not needed, undo this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why it's not needed? It should be the class name.

Copy link
Contributor

Choose a reason for hiding this comment

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

quotes are optional for attributes without spaces in the value

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Didn't konw that, but it's best practice to not do that, right?

Copy link
Member

Choose a reason for hiding this comment

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

Please change this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated.

@yuxiaoy1
Copy link
Contributor Author

yuxiaoy1 commented Jan 6, 2024

Is it ok to merge the PR now?

@yuxiaoy1
Copy link
Contributor Author

yuxiaoy1 commented Jan 9, 2024

Please review @davidism

@davidism
Copy link
Member

davidism commented Jan 9, 2024

No need to ping me, a maintainer will review when they have time.

Copy link
Contributor

@pamelafox pamelafox left a comment

Choose a reason for hiding this comment

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

Thanks! Changes look good, merging.

@pamelafox pamelafox merged commit 91d3932 into pallets-eco:3.1.x Jan 14, 2024
@yuxiaoy1 yuxiaoy1 deleted the refactor/docs branch January 15, 2024 13:30
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants