fixed error where push webhook not called if is new branch or tag

removed unnecessary code

Signed-off-by: David Schneiderbauer <[email protected]>

Author: daviian

models/action.go

@@ -622,13 +622,15 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
 			if err != nil {
 				log.Error(4, "GetBranchCommitID[%s]: %v", opts.RefFullName, err)
 			}
-			return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
+			if err = PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
 				Ref:     refName,
 				Sha:     shaSum,
 				RefType: "branch",
 				Repo:    apiRepo,
 				Sender:  apiPusher,
-			})
+			}); err != nil {
+				return fmt.Errorf("PrepareWebhooks: %v", err)
+			}
 		}
 
 	case ActionDeleteBranch: // Delete Branch
@@ -645,14 +647,15 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
 		if err != nil {
 			log.Error(4, "GetTagCommitID[%s]: %v", opts.RefFullName, err)
 		}
-		return PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
+		if err = PrepareWebhooks(repo, HookEventCreate, &api.CreatePayload{
 			Ref:     refName,
 			Sha:     shaSum,
 			RefType: "tag",
 			Repo:    apiRepo,
 			Sender:  apiPusher,
-		})
-
+		}); err != nil {
+			return fmt.Errorf("PrepareWebhooks: %v", err)
+		}
 	case ActionDeleteTag: // Delete Tag
 		isHookEventPush = true
 	}

models/action_test.go

@@ -312,9 +312,7 @@ func TestCommitRepoAction(t *testing.T) {
 		s.commitRepoActionOptions.RepoName = repo.Name
 
 		s.action.ActUserID = user.ID
-		s.action.ActUser = user
 		s.action.RepoID = repo.ID
-		s.action.Repo = repo
 		s.action.IsPrivate = repo.IsPrivate
 
 		testCorrectRepoAction(t, s.commitRepoActionOptions, &s.action)