Enable status indicator if no config value has been set (#4923)

This fixes #4914 and also removes the default value from the `dev/site-config.json` so that a dev setup makes use of the computed value.
sourcegraph · Jul 17, 2019 · a5e8889 · a5e8889
1 parent 0568188
commit a5e8889
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/dev/site-config.json b/dev/site-config.json
@@ -1,8 +1,7 @@
 // The Sourcegraph site configuration for development servers.
 {
   "experimentalFeatures": {
-    "discussions": "enabled",
-    "statusIndicator": "enabled"
+    "discussions": "enabled"
   },
   "disablePublicRepoRedirects": true,
   "repoListUpdateInterval": 1

diff --git a/pkg/conf/computed.go b/pkg/conf/computed.go
@@ -280,5 +280,9 @@ func Branding() *schema.Branding {
 }
 
 func ShowStatusIndicator() bool {
-	return Get().ExperimentalFeatures.StatusIndicator == "enabled"
+	val := Get().ExperimentalFeatures.StatusIndicator
+	if val == "" {
+		return true
+	}
+	return val == "enabled"
 }