Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit c488a10

Browse files
authored
Merge branch 'master' into fixes/2468-dotcom-web-flow-only
2 parents 43dbfdc + f3f8dee commit c488a10

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

src/GitHub.App/Services/FromGraphQlExtensions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ public static class FromGraphQlExtensions
2929
return CheckConclusionState.Success;
3030
case Octokit.GraphQL.Model.CheckConclusionState.Neutral:
3131
return CheckConclusionState.Neutral;
32+
case Octokit.GraphQL.Model.CheckConclusionState.Skipped:
33+
return CheckConclusionState.Skipped;
34+
case Octokit.GraphQL.Model.CheckConclusionState.Stale:
35+
return CheckConclusionState.Stale;
3236
default:
3337
throw new ArgumentOutOfRangeException(nameof(value), value, null);
3438
}

src/GitHub.App/Services/MentionsAutoCompleteSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public IObservable<AutoCompleteSuggestion> GetSuggestions()
5454
{
5555
query = new Query().Repository(owner: Var(nameof(owner)), name: Var(nameof(name)))
5656
.Select(repository =>
57-
repository.MentionableUsers(null, null, null, null)
57+
repository.MentionableUsers(null, null, null, null, null)
5858
.AllPages()
5959
.Select(sourceItem =>
6060
new SuggestionItem(sourceItem.Login,

src/GitHub.Exports/Models/CheckConclusionState.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ public enum CheckConclusionState
88
Failure,
99
Success,
1010
Neutral,
11+
Skipped,
12+
Stale
1113
}
1214
}

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ async Task<PullRequestDetailModel> ReadPullRequestDetailWithResolved(HostAddress
347347
}).ToList(),
348348
Threads = pr.ReviewThreads(null, null, null, null).AllPages().Select(thread => new PullRequestReviewThreadModel
349349
{
350-
Comments = thread.Comments(null, null, null, null).AllPages().Select(comment => new CommentAdapter
350+
Comments = thread.Comments(null, null, null, null, null).AllPages().Select(comment => new CommentAdapter
351351
{
352352
Id = comment.Id.Value,
353353
PullRequestId = comment.PullRequest.Number,

src/GitHub.VisualStudio.Vsix/source.extension.vsixmanifest

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
</Metadata>
1515
<Installation AllUsers="true" Experimental="false">
1616
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,17.0)" />
17-
<InstallationTarget Id="Microsoft.VisualStudio.IntegratedShell" Version="[15.0,17.0)" />
1817
</Installation>
1918
<Dependencies>
2019
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
2120
<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0,)" />
22-
<Dependency Id="Microsoft.VisualStudio.TeamFoundation.TeamExplorer.Extensions" DisplayName="Team Explorer" d:Source="Installed" Version="[14.0,)" />
2321
</Dependencies>
2422
<Assets>
2523
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GitHub.Exports" Path="|GitHub.Exports|" />
@@ -45,4 +43,4 @@
4543
<Prerequisites>
4644
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25824.0,)" DisplayName="Visual Studio core editor" />
4745
</Prerequisites>
48-
</PackageManifest>
46+
</PackageManifest>

submodules/octokit.graphql.net

Submodule octokit.graphql.net updated 475 files

0 commit comments

Comments
 (0)