Skip to content

Commit

Permalink
fix: bad merge remove extra line
Browse files Browse the repository at this point in the history
  • Loading branch information
fitz7 committed Aug 8, 2024
1 parent c0a34a3 commit 3ba8726
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion server/events/vcs/gitlab_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ func (g *GitlabClient) UpdateStatus(logger logging.SimpleLogging, repo models.Re
logger.Debug("mr.HeadPipeline.SHA: '%s' does not match pull.HeadCommit '%s'", mr.HeadPipeline.SHA, pull.HeadCommit)
return nil
}
refTarget = mr.HeadPipeline.Ref

// set pipeline ID for the req once found
pipelineID = gitlab.Ptr(mr.HeadPipeline.ID)
Expand Down
5 changes: 2 additions & 3 deletions server/events/vcs/gitlab_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ import (

var projectID = 4580910


const (
gitlabPipelineSuccessSha = "67cb91d3f6198189f433c045154a885784ba6977"
gitlabPipelineSuccessMrID = 488598
gitlabPipelineSuccessSha = "67cb91d3f6198189f433c045154a885784ba6977"
gitlabPipelineSuccessMrID = 488598
)

// Test that the base url gets set properly.
Expand Down

0 comments on commit 3ba8726

Please sign in to comment.