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

Change header for unchanged notebook meta #736

Merged
merged 7 commits into from
Nov 17, 2023

Conversation

vidartf
Copy link
Collaborator

@vidartf vidartf commented Nov 17, 2023

We previously changed to always showing the metadata diff in notebook merges, in case the user needs to make manual edits to it even if there are no changes in the merge itself. That change did not take into account that the display behavior here made some assumptions about only being shown when there was a change. Here we make the title conditional on whether there are changes or not, and make sure not to collapse similar changes in the case where there are none.

Fixes #718 .

We previously changed to always showing the metadata diff in notebook merges, in case the user needs to make manual edits to it even if there are no changes in the merge itself. That change did not take into account that the display behavior here made some assumptions about only being shown when there was a change. Here we make the title conditional on whether there are changes or not, and make sure not to collapse similar changes in the case where there are none.
@vidartf
Copy link
Collaborator Author

vidartf commented Nov 17, 2023

Bot please update playwright snapshots

Copy link
Contributor

Playwright ubuntu-22.04 snapshots updated.

Copy link
Contributor

Playwright windows-latest snapshots updated.

@vidartf vidartf closed this Nov 17, 2023
@vidartf vidartf reopened this Nov 17, 2023
@vidartf
Copy link
Collaborator Author

vidartf commented Nov 17, 2023

Bot please update playwright snapshots

Copy link
Contributor

Playwright windows-latest snapshots updated.

Copy link
Contributor

Playwright ubuntu-22.04 snapshots updated.

@vidartf vidartf closed this Nov 17, 2023
@vidartf vidartf reopened this Nov 17, 2023
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
Copy link
Member

@krassowski krassowski left a comment

Choose a reason for hiding this comment

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

Thank you!

@krassowski krassowski merged commit d418783 into jupyter:master Nov 17, 2023
15 checks passed
@vidartf vidartf deleted the nb-meta-unchanged branch November 20, 2023 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Identical content editor are collapsed
2 participants