tangled.org
oppi.li
+1
-2
appview/state/pull.go
+1
-2
appview/state/pull.go
···
508
}
509
510
func (s *State) MergePull(w http.ResponseWriter, r *http.Request) {
511
-
user := s.auth.GetUser(r)
512
f, err := fullyResolvedRepo(r)
513
if err != nil {
514
log.Println("failed to resolve repo:", err)
···
538
}
539
540
// Merge the pull request
541
-
resp, err := ksClient.Merge([]byte(pull.LatestPatch()), user.Did, f.RepoName, pull.TargetBranch, pull.Title, pull.Body, "", "")
542
if err != nil {
543
log.Printf("failed to merge pull request: %s", err)
544
s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
···
508
}
509
510
func (s *State) MergePull(w http.ResponseWriter, r *http.Request) {
511
f, err := fullyResolvedRepo(r)
512
if err != nil {
513
log.Println("failed to resolve repo:", err)
···
537
}
538
539
// Merge the pull request
540
+
resp, err := ksClient.Merge([]byte(pull.LatestPatch()), f.OwnerDid(), f.RepoName, pull.TargetBranch, pull.Title, pull.Body, "", "")
541
if err != nil {
542
log.Printf("failed to merge pull request: %s", err)
543
s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")