Fixing merge

model/config.go

@@ -21,6 +21,10 @@ const (
 
 	SERVICE_GITLAB = "gitlab"
 	SERVICE_GOOGLE = "google"
+
+	WEBSERVER_MODE_REGULAR  = "regular"
+	WEBSERVER_MODE_GZIP     = "gzip"
+	WEBSERVER_MODE_DISABLED = "disabled"
 )
 
 type ServiceSettings struct {
@@ -46,6 +50,7 @@ type ServiceSettings struct {
 	SessionCacheInMinutes             *int
 	WebsocketSecurePort               *int
 	WebsocketPort                     *int
+	WebserverMode                     *string
 }
 
 type SSOSettings struct {
@@ -391,6 +396,11 @@ func (o *Config) SetDefaults() {
 		*o.ServiceSettings.AllowCorsFrom = ""
 	}
 
+	if o.ServiceSettings.WebserverMode == nil {
+		o.ServiceSettings.WebserverMode = new(string)
+		*o.ServiceSettings.WebserverMode = "regular"
+	}
+
 	if o.ComplianceSettings.Enable == nil {
 		o.ComplianceSettings.Enable = new(bool)
 		*o.ComplianceSettings.Enable = false