From 2da609a724a46cad13625cc22934b5edee6eaa9d Mon Sep 17 00:00:00 2001 From: Ryan Gribble Date: Sun, 13 Dec 2015 23:35:43 +1000 Subject: [PATCH] Remove obsolete/deprecated MergeCommitSha property Add Merged boolean property, returning MergedAt.HasValue --- Octokit/Models/Response/PullRequest.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Octokit/Models/Response/PullRequest.cs b/Octokit/Models/Response/PullRequest.cs index e5b507a3..e4286016 100644 --- a/Octokit/Models/Response/PullRequest.cs +++ b/Octokit/Models/Response/PullRequest.cs @@ -14,7 +14,7 @@ namespace Octokit Number = number; } - public PullRequest(Uri url, Uri htmlUrl, Uri diffUrl, Uri patchUrl, Uri issueUrl, Uri statusesUrl, int number, ItemState state, string title, string body, DateTimeOffset createdAt, DateTimeOffset updatedAt, DateTimeOffset? closedAt, DateTimeOffset? mergedAt, GitReference head, GitReference @base, User user, User assignee, string mergeCommitSha, bool? mergeable, User mergedBy, int comments, int commits, int additions, int deletions, int changedFiles) + public PullRequest(Uri url, Uri htmlUrl, Uri diffUrl, Uri patchUrl, Uri issueUrl, Uri statusesUrl, int number, ItemState state, string title, string body, DateTimeOffset createdAt, DateTimeOffset updatedAt, DateTimeOffset? closedAt, DateTimeOffset? mergedAt, GitReference head, GitReference @base, User user, User assignee, bool? mergeable, User mergedBy, int comments, int commits, int additions, int deletions, int changedFiles) { Url = url; HtmlUrl = htmlUrl; @@ -34,7 +34,6 @@ namespace Octokit Base = @base; User = user; Assignee = assignee; - MergeCommitSha = mergeCommitSha; Mergeable = mergeable; MergedBy = mergedBy; Comments = comments; @@ -135,9 +134,12 @@ namespace Octokit public User Assignee { get; protected set; } /// - /// The SHA of the merge commit. + /// Whether or not the pull request has been merged. /// - public string MergeCommitSha { get; protected set; } + public bool Merged + { + get { return MergedAt.HasValue; } + } /// /// Whether or not the pull request can be merged.