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

Use more the contextual collaborative model attribute #13564

Merged

Conversation

fcollonval
Copy link
Member

References

Follow-up of #13458

Code changes

Depend less on PageConfig and more on API.

User-facing changes

N/A

Backwards-incompatible changes

N/A

@jupyterlab-probot
Copy link

Thanks for making a pull request to jupyterlab!
To try out this branch on binder, follow this link: Binder

Copy link
Member

@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
Copy link
Member Author

CI failures are not related

@fcollonval fcollonval merged commit ca1a958 into jupyterlab:master Dec 13, 2022
@fcollonval fcollonval deleted the fix/clean-pageconfig-collaborative branch December 13, 2022 12:53
@fcollonval
Copy link
Member Author

@meeseeksdev please backport to 3.6.x

@lumberbot-app
Copy link

lumberbot-app bot commented Dec 13, 2022

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 3.6.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 ca1a958f2396d08b98fbbd2b67583c3f21ef859b
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #13564: Use more the contextual collaborative model attribute'
  1. Push to a named branch:
git push YOURFORK 3.6.x:auto-backport-of-pr-13564-on-3.6.x
  1. Create a PR against branch 3.6.x, I would have named this PR:

"Backport PR #13564 on branch 3.6.x (Use more the contextual collaborative model attribute)"

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.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants