22bfd0c83e
fix: format of date when MR was closed or merged (#367) refactor: Add Payload Validators + Middleware In Go Code (#366) fix: Add better checks for leaving comments (#369) fix: regex support for http credentials embedded in remote url (#372) fix: Comment on single line selects two lines (#371) This is a #PATCH release.
59 lines
1.6 KiB
Go
59 lines
1.6 KiB
Go
package app
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
|
|
"github.com/xanzy/go-gitlab"
|
|
)
|
|
|
|
type AcceptMergeRequestRequest struct {
|
|
DeleteBranch bool `json:"delete_branch"`
|
|
SquashMessage string `json:"squash_message"`
|
|
Squash bool `json:"squash"`
|
|
}
|
|
|
|
type MergeRequestAccepter interface {
|
|
AcceptMergeRequest(pid interface{}, mergeRequest int, opt *gitlab.AcceptMergeRequestOptions, options ...gitlab.RequestOptionFunc) (*gitlab.MergeRequest, *gitlab.Response, error)
|
|
}
|
|
|
|
type mergeRequestAccepterService struct {
|
|
data
|
|
client MergeRequestAccepter
|
|
}
|
|
|
|
/* acceptAndMergeHandler merges a given merge request into the target branch */
|
|
func (a mergeRequestAccepterService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|
payload := r.Context().Value(payload("payload")).(*AcceptMergeRequestRequest)
|
|
|
|
opts := gitlab.AcceptMergeRequestOptions{
|
|
Squash: &payload.Squash,
|
|
ShouldRemoveSourceBranch: &payload.DeleteBranch,
|
|
}
|
|
|
|
if payload.SquashMessage != "" {
|
|
opts.SquashCommitMessage = &payload.SquashMessage
|
|
}
|
|
|
|
_, res, err := a.client.AcceptMergeRequest(a.projectInfo.ProjectId, a.projectInfo.MergeId, &opts)
|
|
|
|
if err != nil {
|
|
handleError(w, err, "Could not merge MR", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
if res.StatusCode >= 300 {
|
|
handleError(w, GenericError{r.URL.Path}, "Could not merge MR", res.StatusCode)
|
|
return
|
|
}
|
|
|
|
response := SuccessResponse{Message: "MR merged successfully"}
|
|
|
|
w.WriteHeader(http.StatusOK)
|
|
|
|
err = json.NewEncoder(w).Encode(response)
|
|
if err != nil {
|
|
handleError(w, err, "Could not encode response", http.StatusInternalServerError)
|
|
}
|
|
}
|