Add status checks.

go-gitea · Nov 15, 2019 · 76b639b · 76b639b
1 parent 6a7d9d4
commit 76b639b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/modules/convert/convert.go b/modules/convert/convert.go
@@ -33,21 +33,25 @@ func ToEmail(email *models.EmailAddress) *api.Email {
 func ToBranch(repo *models.Repository, b *git.Branch, c *git.Commit, bp *models.ProtectedBranch, user *models.User) *api.Branch {
 	if bp == nil {
 		return &api.Branch{
-			Name:              b.Name,
-			Commit:            ToCommit(repo, c),
-			Protected:         false,
-			RequiredApprovals: 0,
-			UserCanPush:       true,
-			UserCanMerge:      true,
+			Name:                b.Name,
+			Commit:              ToCommit(repo, c),
+			Protected:           false,
+			RequiredApprovals:   0,
+			EnableStatusCheck:   false,
+			StatusCheckContexts: []string{},
+			UserCanPush:         true,
+			UserCanMerge:        true,
 		}
 	}
 	return &api.Branch{
-		Name:              b.Name,
-		Commit:            ToCommit(repo, c),
-		Protected:         true,
-		RequiredApprovals: bp.RequiredApprovals,
-		UserCanPush:       bp.CanUserPush(user.ID),
-		UserCanMerge:      bp.CanUserMerge(user.ID),
+		Name:                b.Name,
+		Commit:              ToCommit(repo, c),
+		Protected:           true,
+		RequiredApprovals:   bp.RequiredApprovals,
+		EnableStatusCheck:   bp.EnableStatusCheck,
+		StatusCheckContexts: bp.StatusCheckContexts,
+		UserCanPush:         bp.CanUserPush(user.ID),
+		UserCanMerge:        bp.CanUserMerge(user.ID),
 	}
 }
 

diff --git a/modules/structs/repo_branch.go b/modules/structs/repo_branch.go
@@ -6,10 +6,12 @@ package structs
 
 // Branch represents a repository branch
 type Branch struct {
-	Name              string         `json:"name"`
-	Commit            *PayloadCommit `json:"commit"`
-	Protected         bool           `json:"protected"`
-	RequiredApprovals int64          `json:"required_approvals"`
-	UserCanPush       bool           `json:"user_can_push"`
-	UserCanMerge      bool           `json:"user_can_merge"`
+	Name                string         `json:"name"`
+	Commit              *PayloadCommit `json:"commit"`
+	Protected           bool           `json:"protected"`
+	RequiredApprovals   int64          `json:"required_approvals"`
+	EnableStatusCheck   bool           `json:"enable_status_check"`
+	StatusCheckContexts []string       `json:"status_check_contexts"`
+	UserCanPush         bool           `json:"user_can_push"`
+	UserCanMerge        bool           `json:"user_can_merge"`
 }
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
@@ -7583,6 +7583,10 @@
         "commit": {
           "$ref": "#/definitions/PayloadCommit"
         },
+        "enable_status_check": {
+          "type": "boolean",
+          "x-go-name": "EnableStatusCheck"
+        },
         "name": {
           "type": "string",
           "x-go-name": "Name"
@@ -7596,6 +7600,13 @@
           "format": "int64",
           "x-go-name": "RequiredApprovals"
         },
+        "status_check_contexts": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "x-go-name": "StatusCheckContexts"
+        },
         "user_can_merge": {
           "type": "boolean",
           "x-go-name": "UserCanMerge"