mirror of
https://github.com/portainer/portainer.git
synced 2025-07-21 14:29:40 +02:00
resolve conflicts
This commit is contained in:
commit
0ee42f76c3
84 changed files with 1475 additions and 205 deletions
|
@ -149,6 +149,8 @@ func (handler *Handler) createKubernetesStack(w http.ResponseWriter, r *http.Req
|
|||
return handler.createKubernetesStackFromFileContent(w, r, endpoint, userID)
|
||||
case "repository":
|
||||
return handler.createKubernetesStackFromGitRepository(w, r, endpoint, userID)
|
||||
case "url":
|
||||
return handler.createKubernetesStackFromManifestURL(w, r, endpoint, userID)
|
||||
}
|
||||
return &httperror.HandlerError{StatusCode: http.StatusBadRequest, Message: "Invalid value for query parameter: method. Value must be one of: string or repository", Err: errors.New(request.ErrInvalidQueryParameter)}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue