search

deconst / content-service

An API for storing, indexing and retrieving documentation
MIT License
4 stars 9 forks source link

Merge assets from upstream and local in /assets. #77

Closed smashwilson closed 8 years ago

smashwilson commented 8 years ago

When PROXY_UPSTREAM is set, make an asset request to the upstream content store. Merge in local assets, preferring local assets to upstream ones when names are shared.

Remove the { assets: {} } key from the /content/ response, because the presenter hasn't been using it anyway! I deprecated the presenter side of that ages ago, back in deconst/presenter#87.

smashwilson commented 8 years ago

By the way, assets will still be available to templates as "deconst.content.assets" as well as "deconst.assets", so this won't break any templates.