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

Commit d8ddc70

Browse files
jcansdalejcansdale
authored
Merge branch 'master' into fixes/2440-release-notes
2 parents c2495b6 + 4a58240 commit d8ddc70

File tree

7 files changed

+42
-31
lines changed

7 files changed

+42
-31
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.UI/Views/Dialog/LoginCredentialsView.xaml‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -85,32 +85,39 @@
8585
<StackPanel x:Name="dotComloginControlsPanel">
8686

8787
<StackPanel Style="{StaticResource FormFieldStackPanel}">
88-
<ghfvs:PromptTextBox
89-
x:Name="dotComUserNameOrEmail"
90-
PromptText="{x:Static ghfvs:Resources.UserNameOrEmailPromptText}"
91-
Margin="0,0,0,10" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomUsernameEmailTextBox}" />
92-
93-
<ghfvs:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static ghfvs:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomPasswordTextBox}"/>
94-
95-
<Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
96-
<Button
97-
x:Name="dotComLogInButton"
98-
Content="{x:Static ghfvs:Resources.LoginLink}"
99-
IsDefault="True"
100-
Command=""
101-
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomSignInButton}" />
102-
</Border>
103-
104-
<Grid Margin="0 8">
105-
<Grid.ColumnDefinitions>
106-
<ColumnDefinition Width="*"/>
107-
<ColumnDefinition Width="Auto"/>
108-
<ColumnDefinition Width="*"/>
109-
</Grid.ColumnDefinitions>
110-
<Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
111-
<TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
112-
<Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
113-
</Grid>
88+
<!--
89+
Signing with with username/password is going away, see:
90+
https://developer.github.com/changes/2020-02-14-deprecating-oauth-auth-endpoint/
91+
Setting Visibility="Collapsed"
92+
-->
93+
<StackPanel Name="dotComUsernamePasswordPanel" Visibility="Collapsed">
94+
<ghfvs:PromptTextBox
95+
x:Name="dotComUserNameOrEmail"
96+
PromptText="{x:Static ghfvs:Resources.UserNameOrEmailPromptText}"
97+
Margin="0,0,0,10" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomUsernameEmailTextBox}" />
98+
99+
<ghfvs:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static ghfvs:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomPasswordTextBox}"/>
100+
101+
<Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
102+
<Button
103+
x:Name="dotComLogInButton"
104+
Content="{x:Static ghfvs:Resources.LoginLink}"
105+
IsDefault="True"
106+
Command=""
107+
AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.DotcomSignInButton}" />
108+
</Border>
109+
110+
<Grid Margin="0 8">
111+
<Grid.ColumnDefinitions>
112+
<ColumnDefinition Width="*"/>
113+
<ColumnDefinition Width="Auto"/>
114+
<ColumnDefinition Width="*"/>
115+
</Grid.ColumnDefinitions>
116+
<Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
117+
<TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
118+
<Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
119+
</Grid>
120+
</StackPanel>
114121

115122
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
116123
<ghfvs:GitHubActionLink x:Name="dotComSsaLogInButton" Content="{x:Static ghfvs:Resources.SignInWithYourBrowser}"/>

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

Lines changed: 0 additions & 2 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|" />

‎submodules/octokit.graphql.net‎

Submodule octokit.graphql.net updated 475 files

0 commit comments

Comments
 (0)