From bf1ccc47db812fc22bc7aac53e33f33ff589d342 Mon Sep 17 00:00:00 2001
From: David McPike <7037366+mcdafydd@users.noreply.github.com>
Date: Mon, 29 Apr 2019 20:19:02 -0500
Subject: [PATCH] Azure Devops support

- Fixes logic error in PullIsMergeable()
- Replace GetRemoteURL() with GetWebURL() - returns what we want
---
 server/events/event_parser.go           | 2 +-
 server/events/vcs/azuredevops_client.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/events/event_parser.go b/server/events/event_parser.go
index e20563a13..22e0b2af9 100644
--- a/server/events/event_parser.go
+++ b/server/events/event_parser.go
@@ -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
 		}
diff --git a/server/events/vcs/azuredevops_client.go b/server/events/vcs/azuredevops_client.go
index be1f7e4dc..3cff8efa8 100644
--- a/server/events/vcs/azuredevops_client.go
+++ b/server/events/vcs/azuredevops_client.go
@@ -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.