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.

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

Fix notebook undo scope #148

Merged
merged 4 commits into from
Feb 22, 2023
Merged

Fix notebook undo scope #148

merged 4 commits into from
Feb 22, 2023

Conversation

fcollonval
Copy link
Member

This fixes the scoping of the undo manager on cells.

Xref: jupyterlab/jupyterlab#10791

@fcollonval fcollonval added the bug Something isn't working label Feb 21, 2023
@fcollonval fcollonval added this to the 0.2.x milestone Feb 21, 2023
@fcollonval fcollonval mentioned this pull request Feb 21, 2023
Merged
hbcarlos
hbcarlos approved these changes Feb 21, 2023
View reviewed changes
Copy link
Contributor

@hbcarlos hbcarlos left a comment

Choose a reason for hiding this comment

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

Thanks, @fcollonval!

@fcollonval fcollonval merged commit bfc54ef into jupyter-server:main Feb 22, 2023
@fcollonval fcollonval deleted the fix/notebook-undo-history branch February 22, 2023 08:59
@fcollonval
Copy link
Member Author

@meeseeksdev please backport to 0.2.x

@lumberbot-app
Copy link

lumberbot-app bot commented Feb 22, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 0.2.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 bfc54ef02683ee61808c349bd72022e713408460
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #148: Fix notebook undo scope'
  1. Push to a named branch:
git push YOURFORK 0.2.x:auto-backport-of-pr-148-on-0.2.x
  1. Create a PR against branch 0.2.x, I would have named this PR:

"Backport PR #148 on branch 0.2.x (Fix notebook undo scope)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

fcollonval added a commit to fcollonval/jupyter_ydoc that referenced this pull request Feb 22, 2023
@fcollonval
Backport PR jupyter-server#148: Fix notebook undo scope
924ce7b
@fcollonval fcollonval mentioned this pull request Feb 22, 2023
Merged
fcollonval added a commit that referenced this pull request Feb 22, 2023
@fcollonval @pre-commit-ci
Backport PR #148 on branch 0.2.x (Fix notebook undo scope) (#149)
e4c4b6c 
* Backport PR #148: Fix notebook undo scope

* Fix CI

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix notebook constructor call

* More constructor fixes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hbcarlos hbcarlos hbcarlos approved these changes

Assignees

@fcollonval fcollonval

Labels
bug Something isn't working Still Needs Manual Backport
Projects
None yet
Milestone
0.2.x
Development

Successfully merging this pull request may close these issues.
2 participants
@fcollonval @hbcarlos