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

Adding special case for non-fontstack "glyph" resource URLs #1389

Merged
merged 1 commit into from
Jul 24, 2015

Conversation

jakepruitt
Copy link

cc/ @samanpwbb @mikemorris @mourner @tmcw

- does not prepend /v4/ to api endpoints like /fonts/v1/
- only prepends it to things starting with /fontstack
- solves the problem in #1385
- refs mapbox/mapbox-gl-style-spec#309
@mikemorris
Copy link
Contributor

👍

@mourner
Copy link
Member

mourner commented Jul 24, 2015

Hmm, why did you merge and then revert the commit in master?

@jakepruitt
Copy link
Author

@mourner I accidentally pushed to master at first. Figured it was best to revert and then create a separate pull request. Felt safer than git rebase and git push master --force. If you want me to clean up master after this is merged, let me know!

@mourner
Copy link
Member

mourner commented Jul 24, 2015

Eh, can't rebase/merge it properly now since master already contains the commit... Will do a button merge then.

mourner added a commit that referenced this pull request Jul 24, 2015
Adding special case for non-fontstack "glyph" resource URLs
@mourner mourner merged commit ddc7070 into master Jul 24, 2015
@mourner mourner deleted the special-glyph-urls branch July 24, 2015 13:40
@jakepruitt
Copy link
Author

thanks @mourner!! Sorry about the slip up!

@jakepruitt jakepruitt restored the special-glyph-urls branch July 29, 2015 15:18
@jfirebaugh jfirebaugh deleted the special-glyph-urls branch August 7, 2015 18:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants