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

Commit 129d863

Browse files
Merge branch 'features/check-suite-annotations' into features/check-suite-annotations-inline
# Conflicts: # src/GitHub.App/ViewModels/GitHubPane/PullRequestAnnotationItemViewModel.cs
2 parents 1e65e46 + cb3e082 commit 129d863

File tree

5 files changed

+3
-14
lines changed

5 files changed

+3
-14
lines changed

src/GitHub.App/SampleData/PullRequestAnnotationsViewModelDesigner.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Diagnostics.CodeAnalysis;
33
using System.Reactive;
44
using System.Threading.Tasks;
5-
using GitHub.App.ViewModels.GitHubPane;
65
using GitHub.Models;
76
using GitHub.ViewModels.GitHubPane;
87
using ReactiveUI;

src/GitHub.App/Services/PullRequestService.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ public async Task<Page<PullRequestListItemModel>> ReadPullRequests(
116116
Conclusion = run.Conclusion.FromGraphQl(),
117117
Status = run.Status.FromGraphQl()
118118
}).ToList(),
119-
ApplicationName = suite.App != null ? suite.App.Name : "Private App"
120119
}).ToList(),
121120
Statuses = commit.Commit.Status
122121
.Select(context =>
@@ -1029,8 +1028,6 @@ class LastCommitSummaryAdapter
10291028
class CheckSuiteSummaryModel
10301029
{
10311030
public List<CheckRunSummaryModel> CheckRuns { get; set; }
1032-
1033-
public string ApplicationName { get; set; }
10341031
}
10351032

10361033
class CheckRunSummaryModel

src/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ static async Task<bool> IsValidRepository(ISimpleApiClient client)
513513

514514
static Regex CreateRoute(string route)
515515
{
516-
// Build RegEx from route (:foo to named group (?<foo>[\w_.-=]+)).
516+
// Build RegEx from route (:foo to named group (?<foo>[\w_.\-=]+)).
517517
var routeFormat = "^" + new Regex("(:([a-z]+))\\b").Replace(route, @"(?<$2>[\w_.\-=]+)") + "$";
518518
return new Regex(routeFormat, RegexOptions.ExplicitCapture | RegexOptions.IgnoreCase);
519519
}

src/GitHub.App/ViewModels/GitHubPane/PullRequestAnnotationItemViewModel.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
using System.Reactive;
2-
using System.Reactive.Linq;
32
using GitHub.Models;
4-
using GitHub.Services;
5-
using GitHub.ViewModels;
6-
using GitHub.ViewModels.GitHubPane;
73
using ReactiveUI;
84

9-
namespace GitHub.App.ViewModels.GitHubPane
5+
namespace GitHub.ViewModels.GitHubPane
106
{
117
/// <inheritdoc cref="IPullRequestAnnotationItemViewModel"/>
128
public class PullRequestAnnotationItemViewModel : ViewModelBase, IPullRequestAnnotationItemViewModel

src/GitHub.App/ViewModels/GitHubPane/PullRequestAnnotationsViewModel.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
using System.Threading.Tasks;
77
using GitHub.Models;
88
using GitHub.Services;
9-
using GitHub.ViewModels.GitHubPane;
109
using ReactiveUI;
11-
using ReactiveUI.Legacy;
12-
using ReactiveCommand = ReactiveUI.ReactiveCommand;
1310

14-
namespace GitHub.App.ViewModels.GitHubPane
11+
namespace GitHub.ViewModels.GitHubPane
1512
{
1613
/// <inheritdoc cref="IPullRequestAnnotationsViewModel"/>
1714
[Export(typeof(IPullRequestAnnotationsViewModel))]

0 commit comments

Comments
 (0)