Edit the drafted merge message before confirming
This commit is contained in:
@@ -361,6 +361,11 @@ func (s *Server) GetCoAuthors(w http.ResponseWriter, r *http.Request, taskID str
|
||||
}
|
||||
|
||||
func (s *Server) MergeTask(w http.ResponseWriter, r *http.Request, taskID string) {
|
||||
req := api.MergeTaskJSONRequestBody{}
|
||||
if !readJSON(w, r, &req) {
|
||||
return
|
||||
}
|
||||
|
||||
t, p, ok := s.activeTask(w, r, taskID)
|
||||
if !ok {
|
||||
return
|
||||
@@ -372,7 +377,7 @@ func (s *Server) MergeTask(w http.ResponseWriter, r *http.Request, taskID string
|
||||
return
|
||||
}
|
||||
|
||||
t, err = s.agents.Merge(r.Context(), t, p, u)
|
||||
t, err = s.agents.Merge(r.Context(), t, p, u, req.MergeTitle)
|
||||
if err != nil {
|
||||
writeAgentError(w, err)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user