Fixing merge

model/client.go

@@ -363,8 +363,11 @@ func (c *Client) Command(channelId string, command string, suggest bool) (*Resul
 	}
 }
 
-func (c *Client) ListCommands() (*Result, *AppError) {
-	if r, err := c.DoApiGet("/commands/list", "", ""); err != nil {
+func (c *Client) ListCommands(channelId string, command string) (*Result, *AppError) {
+	m := make(map[string]string)
+	m["command"] = command
+	m["channelId"] = channelId
+	if r, err := c.DoApiPost("/commands/list", MapToJson(m)); err != nil {
 		return nil, err
 	} else {
 		return &Result{r.Header.Get(HEADER_REQUEST_ID),

model/command.go

@@ -14,22 +14,23 @@ const (
 )
 
 type Command struct {
-	Id               string `json:"id"`
-	Token            string `json:"token"`
-	CreateAt         int64  `json:"create_at"`
-	UpdateAt         int64  `json:"update_at"`
-	DeleteAt         int64  `json:"delete_at"`
-	CreatorId        string `json:"creator_id"`
-	TeamId           string `json:"team_id"`
-	Trigger          string `json:"trigger"`
-	Method           string `json:"method"`
-	Username         string `json:"username"`
-	IconURL          string `json:"icon_url"`
-	AutoComplete     bool   `json:"auto_complete"`
-	AutoCompleteDesc string `json:"auto_complete_desc"`
-	AutoCompleteHint string `json:"auto_complete_hint"`
-	DisplayName      string `json:"display_name"`
-	URL              string `json:"url"`
+	Id                 string `json:"id"`
+	Token              string `json:"token"`
+	CreateAt           int64  `json:"create_at"`
+	UpdateAt           int64  `json:"update_at"`
+	DeleteAt           int64  `json:"delete_at"`
+	CreatorId          string `json:"creator_id"`
+	TeamId             string `json:"team_id"`
+	ExternalManagement bool   `json:"external_management"`
+	Trigger            string `json:"trigger"`
+	Method             string `json:"method"`
+	Username           string `json:"username"`
+	IconURL            string `json:"icon_url"`
+	AutoComplete       bool   `json:"auto_complete"`
+	AutoCompleteDesc   string `json:"auto_complete_desc"`
+	AutoCompleteHint   string `json:"auto_complete_hint"`
+	DisplayName        string `json:"display_name"`
+	URL                string `json:"url"`
 }
 
 func (o *Command) ToJson() string {

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