mirror of
https://git.vectorsigma.ru/public/atlantis.git
synced 2026-08-04 01:48:37 +00:00
Azure Devops support
- Fixes logic error in PullIsMergeable() - Replace GetRemoteURL() with GetWebURL() - returns what we want
This commit is contained in:
@@ -876,7 +876,7 @@ func (e *EventParser) ParseAzureDevopsRepo(adRepo *azuredevops.GitRepository) (m
|
||||
if parent != nil {
|
||||
owner = parent.GetName()
|
||||
} else {
|
||||
uri, err := url.Parse(adRepo.GetRemoteURL())
|
||||
uri, err := url.Parse(adRepo.GetWebURL())
|
||||
if err != nil {
|
||||
return models.Repo{}, err
|
||||
}
|
||||
|
||||
@@ -171,9 +171,9 @@ func (g *AzureDevopsClient) PullIsMergeable(repo models.Repo, pull models.PullRe
|
||||
}
|
||||
if *adPull.MergeStatus != azuredevops.MergeConflicts.String() &&
|
||||
*adPull.MergeStatus != azuredevops.MergeRejectedByPolicy.String() {
|
||||
return false, nil
|
||||
return true, nil
|
||||
}
|
||||
return true, nil
|
||||
return false, nil
|
||||
}
|
||||
|
||||
// GetPullRequest returns the pull request.
|
||||
|
||||
Reference in New Issue
Block a user