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

restores silent failure behavior when a fileType has no iconClass #7027

Merged
merged 1 commit into from Aug 16, 2019

Conversation

@telamonian
Copy link
Member

@telamonian telamonian commented Aug 16, 2019

References

The first fix for the new icon handling stuff from the recently merged #6034

Code changes

bugfix to IconRegistry

User-facing changes

Previously, if a FileType was missing an iconClass field, Jlab would fail silently when opening a new document of that type (and show no icon on the document's tab). This restores that behavior.

Backwards-incompatible changes

@jupyterlab-dev-mode
Copy link

@jupyterlab-dev-mode jupyterlab-dev-mode bot commented Aug 16, 2019

Thanks for making a pull request to JupyterLab!

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

Copy link
Member

@blink1073 blink1073 left a comment

LGTM, thanks!

@blink1073 blink1073 merged commit 8190b83 into jupyterlab:master Aug 16, 2019
7 of 9 checks passed
@jasongrout jasongrout added this to the 1.1 milestone Aug 16, 2019
@jasongrout
Copy link
Contributor

@jasongrout jasongrout commented Aug 16, 2019

@meeseeksdev backport to 1.0.x

@meeseeksdev
Copy link

@meeseeksdev meeseeksdev bot commented Aug 16, 2019

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 1.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 8190b83c941ee28e72c9d501522c9c7ae4c26aec
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #7027: restores silent failure behavior when a fileType has no iconClass'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-7027-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #7027 on branch 1.0.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.

@lock lock bot locked as resolved and limited conversation to collaborators Sep 15, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants