Merge 882571bd97 into baff48b7d9

* Add icons to registered settings

bakerydemo/base/models.py

@@ -480,7 +480,7 @@ class FormPage(AbstractEmailForm):
     ]
 
 
-@register_setting
+@register_setting(icon="cog")
 class GenericSettings(ClusterableModel, BaseGenericSetting):
     twitter_url = models.URLField(verbose_name="Twitter URL", blank=True)
     github_url = models.URLField(verbose_name="GitHub URL", blank=True)
@@ -498,7 +498,7 @@ class GenericSettings(ClusterableModel, BaseGenericSetting):
     ]
 
 
-@register_setting
+@register_setting(icon="site")
 class SiteSettings(BaseSiteSetting):
     title_suffix = models.CharField(
         verbose_name="Title suffix",

readme.md

@@ -46,7 +46,10 @@ Set up a development environment and run this demo website with a single click (
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/wagtail/bakerydemo/)
 
 Once Gitpod has fully started, and a preview of the bakery website has appeared in the "Simple Browser" panel, click the arrow button to the right of the URL bar to open the website in a new tab.
-Go to `/admin/` and login with `admin / changeme`.
+Append `/admin/` to the URL and login with username `admin` and password `changeme`.
+
+Gitpod uses [prebuilds](https://www.gitpod.io/docs/prebuilds) to reduce wait time, by installing dependencies and running builds **before** you start a new workspace.
+Unfortunately, prebuilds work as a cache. You could get an outdated build. If that is the case, [trigger a new prebuild](https://gitpod.io/#prebuild/https://github.com/wagtail/bakerydemo).
 
 ## Setup with Vagrant