Skip to content

Commit

Permalink
enhance: fixing merge conflicts for branch in scheduled builds
Browse files Browse the repository at this point in the history
  • Loading branch information
Claire.Nicholas authored and Claire.Nicholas committed Aug 23, 2023
1 parent 5d6f6c9 commit b40801b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion api/schedule/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ func UpdateSchedule(c *gin.Context) {

// set the updated by field using claims
s.SetUpdatedBy(u.GetName())
s.SetBranch(input.GetBranch())
if input.GetBranch() != "" {
s.SetBranch(input.GetBranch())
}

// update the schedule within the database
s, err = database.FromContext(c).UpdateSchedule(ctx, s, true)
Expand Down

0 comments on commit b40801b

Please sign in to comment.