isabelroses.com / core
forked from tangled.org/core
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix small bug with pushing

oppi.li 68e4035f 238db83d

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