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

Handle quit_button when launched as an extension #8486

Merged
merged 2 commits into from May 28, 2020

Conversation

blink1073
Copy link
Member

@blink1073 blink1073 commented May 28, 2020

References

Fixes #8483

Code changes

Moves handling of quit_button trait to the extension so it will be used when lab is launched as an extension.

User-facing changes

Quit button logic works when running as jupyter notebook.

Backwards-incompatible changes

None

@blink1073 blink1073 added this to the 2.2 milestone May 28, 2020
@jupyterlab-dev-mode
Copy link

jupyterlab-dev-mode bot commented May 28, 2020

Thanks for making a pull request to JupyterLab!

To try out this branch on binder, follow this link: Binder

afshin
afshin approved these changes May 28, 2020
Copy link
Member

@afshin afshin left a comment

Cheers!

👍

@afshin afshin merged commit fa54a84 into jupyterlab:master May 28, 2020
39 checks passed
@blink1073
Copy link
Member Author

blink1073 commented May 28, 2020

@meeseeksdev please backport to 1.2.x

meeseeksmachine pushed a commit to meeseeksmachine/jupyterlab that referenced this issue May 28, 2020
blink1073 pushed a commit that referenced this issue May 28, 2020
…6-on-1.2.x

Backport PR #8486 on branch 1.2.x (Handle quit_button when launched as an extension)
@blink1073
Copy link
Member Author

blink1073 commented May 28, 2020

@meeseeksdev please backport to 2.1.x

@meeseeksdev
Copy link

meeseeksdev bot commented May 28, 2020

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 2.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 fa54a84033c1010ea5eed170b682c98c64f6f63e
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #8486: Handle quit_button when launched as an extension'
  1. Push to a named branch :
git push YOURFORK 2.1.x:auto-backport-of-pr-8486-on-2.1.x
  1. Create a PR against branch 2.1.x, I would have named this PR:

"Backport PR #8486 on branch 2.1.x"

And apply the correct labels and milestones.

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

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

@blink1073 blink1073 mentioned this pull request May 28, 2020
saulshanabrook pushed a commit that referenced this issue Jun 25, 2020
Handle quit_button when launched as an extension
@github-actions github-actions bot added the status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. label Feb 9, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. tag:Server Change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants