From 3db0ff04ee67fcdbb08024a3d7d857495a1aee85 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 10 Mar 2020 19:16:43 +0000 Subject: [PATCH 1/4] Update to latest Octokit.GraphQL.net --- submodules/octokit.graphql.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/octokit.graphql.net b/submodules/octokit.graphql.net index ff20b6e9de..b38412dc81 160000 --- a/submodules/octokit.graphql.net +++ b/submodules/octokit.graphql.net @@ -1 +1 @@ -Subproject commit ff20b6e9de3d016112de8787ec8ade080214db2b +Subproject commit b38412dc816e034e155f8f89c14da65e04f659ad From 608ab5c2f38e3c4b23ea9cb0ae999eff6ca5a7fa Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 10 Mar 2020 19:51:16 +0000 Subject: [PATCH 2/4] Pass added argument to MentionableUsers --- src/GitHub.App/Services/MentionsAutoCompleteSource.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitHub.App/Services/MentionsAutoCompleteSource.cs b/src/GitHub.App/Services/MentionsAutoCompleteSource.cs index 68fc002292..dab165ce89 100644 --- a/src/GitHub.App/Services/MentionsAutoCompleteSource.cs +++ b/src/GitHub.App/Services/MentionsAutoCompleteSource.cs @@ -54,7 +54,7 @@ public IObservable GetSuggestions() { query = new Query().Repository(owner: Var(nameof(owner)), name: Var(nameof(name))) .Select(repository => - repository.MentionableUsers(null, null, null, null) + repository.MentionableUsers(null, null, null, null, null) .AllPages() .Select(sourceItem => new SuggestionItem(sourceItem.Login, From e149e69e0850c66ae60dbe7d1c450dc22b4fb7be Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 10 Mar 2020 20:00:33 +0000 Subject: [PATCH 3/4] Fix added argument to thread.Comments --- src/GitHub.InlineReviews/Services/PullRequestSessionService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs index 4cdfa9be41..5987d47b3d 100644 --- a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs +++ b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs @@ -347,7 +347,7 @@ async Task ReadPullRequestDetailWithResolved(HostAddress }).ToList(), Threads = pr.ReviewThreads(null, null, null, null).AllPages().Select(thread => new PullRequestReviewThreadModel { - Comments = thread.Comments(null, null, null, null).AllPages().Select(comment => new CommentAdapter + Comments = thread.Comments(null, null, null, null, null).AllPages().Select(comment => new CommentAdapter { Id = comment.Id.Value, PullRequestId = comment.PullRequest.Number, From a5fbe9e461a8f03aa2a3b50152aabaaf436da5c6 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Tue, 10 Mar 2020 23:17:58 +0000 Subject: [PATCH 4/4] Add Skipped and Stale CheckConclusionState --- src/GitHub.App/Services/FromGraphQlExtensions.cs | 4 ++++ src/GitHub.Exports/Models/CheckConclusionState.cs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/GitHub.App/Services/FromGraphQlExtensions.cs b/src/GitHub.App/Services/FromGraphQlExtensions.cs index 0bbd1ce321..06a1c46e2e 100644 --- a/src/GitHub.App/Services/FromGraphQlExtensions.cs +++ b/src/GitHub.App/Services/FromGraphQlExtensions.cs @@ -29,6 +29,10 @@ public static class FromGraphQlExtensions return CheckConclusionState.Success; case Octokit.GraphQL.Model.CheckConclusionState.Neutral: return CheckConclusionState.Neutral; + case Octokit.GraphQL.Model.CheckConclusionState.Skipped: + return CheckConclusionState.Skipped; + case Octokit.GraphQL.Model.CheckConclusionState.Stale: + return CheckConclusionState.Stale; default: throw new ArgumentOutOfRangeException(nameof(value), value, null); } diff --git a/src/GitHub.Exports/Models/CheckConclusionState.cs b/src/GitHub.Exports/Models/CheckConclusionState.cs index 3659c3dadb..a8f24d076b 100644 --- a/src/GitHub.Exports/Models/CheckConclusionState.cs +++ b/src/GitHub.Exports/Models/CheckConclusionState.cs @@ -8,5 +8,7 @@ public enum CheckConclusionState Failure, Success, Neutral, + Skipped, + Stale } } \ No newline at end of file