Merge branch 'main' into colin/singletailnet-moons

coder · coadler · Jul 19, 2023 · Jul 18, 2023 · Jul 19, 2023 · Jul 19, 2023
commit 9a610735238ab93c5d881166ee3f36ef2a2143a6
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -418,6 +418,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 	}
 
 	shouldUpdate := func(initial, changed, enabled bool) bool {
+		// Avoid an initial tick on startup unless the feature is enabled.
 		return changed || (initial && enabled)
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	shouldUpdate := func(initial, changed, enabled bool) bool {
+    		// Avoid an initial tick on startup unless the feature is enabled.
     		return changed || (initial && enabled)
     	}
@@ Expand Down @@