From dd75bcf1791d6cdc9f52b59f7d46708aeec32f3d Mon Sep 17 00:00:00 2001
From: notauserx <notauserx@users.noreply.github.com>
Date: Fri, 12 Aug 2022 20:34:27 +0600
Subject: [PATCH 1/6] add active lock reason to PR

---
 Octokit/Clients/IssuesClient.cs        | 8 ++++----
 Octokit/Models/Response/PullRequest.cs | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Octokit/Clients/IssuesClient.cs b/Octokit/Clients/IssuesClient.cs
index 508e6c2180..f6708029a2 100644
--- a/Octokit/Clients/IssuesClient.cs
+++ b/Octokit/Clients/IssuesClient.cs
@@ -494,7 +494,7 @@ public Task<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate
         }
 
         /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue  or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
         /// <param name="owner">The owner of the repository</param>
@@ -511,7 +511,7 @@ public Task Lock(string owner, string name, int number, LockReason? lockReason =
         }
 
         /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
@@ -524,7 +524,7 @@ public Task Lock(long repositoryId, int number, LockReason? lockReason = null)
         }
 
         /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
         /// <param name="owner">The owner of the repository</param>
@@ -540,7 +540,7 @@ public Task Unlock(string owner, string name, int number)
         }
 
         /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue  or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
diff --git a/Octokit/Models/Response/PullRequest.cs b/Octokit/Models/Response/PullRequest.cs
index 9ca99408ad..e7690c7d44 100644
--- a/Octokit/Models/Response/PullRequest.cs
+++ b/Octokit/Models/Response/PullRequest.cs
@@ -16,7 +16,7 @@ public PullRequest(int number)
             Number = number;
         }
 
-        public PullRequest(long id, string nodeId, string url, string htmlUrl, string diffUrl, string patchUrl, string issueUrl, string 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, IReadOnlyList<User> assignees, bool draft, bool? mergeable, MergeableState? mergeableState, User mergedBy, string mergeCommitSha, int comments, int commits, int additions, int deletions, int changedFiles, Milestone milestone, bool locked, bool? maintainerCanModify, IReadOnlyList<User> requestedReviewers, IReadOnlyList<Team> requestedTeams, IReadOnlyList<Label> labels)
+        public PullRequest(long id, string nodeId, string url, string htmlUrl, string diffUrl, string patchUrl, string issueUrl, string 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, IReadOnlyList<User> assignees, bool draft, bool? mergeable, MergeableState? mergeableState, User mergedBy, string mergeCommitSha, int comments, int commits, int additions, int deletions, int changedFiles, Milestone milestone, bool locked, bool? maintainerCanModify, IReadOnlyList<User> requestedReviewers, IReadOnlyList<Team> requestedTeams, IReadOnlyList<Label> labels, LockReason? activeLockReason)
         {
             Id = id;
             NodeId = nodeId;
@@ -55,6 +55,7 @@ public PullRequest(long id, string nodeId, string url, string htmlUrl, string di
             RequestedReviewers = requestedReviewers;
             RequestedTeams = requestedTeams;
             Labels = labels;
+            ActiveLockReason = activeLockReason;
         }
 
         /// <summary>
@@ -251,6 +252,11 @@ public bool Merged
 
         public IReadOnlyList<Label> Labels { get; protected set; }
 
+        /// <summary>
+        /// Reason that the conversation was locked
+        /// </summary>
+        public StringEnum<LockReason>? ActiveLockReason { get; protected set; }
+
         internal string DebuggerDisplay
         {
             get { return string.Format(CultureInfo.InvariantCulture, "Number: {0} State: {1}", Number, State); }

From 030e41a97911f3d7585d7cc29769c9db94d8f98b Mon Sep 17 00:00:00 2001
From: notauserx <notauserx@users.noreply.github.com>
Date: Fri, 12 Aug 2022 20:40:37 +0600
Subject: [PATCH 2/6] update docs

---
 Octokit/Clients/IIssuesClient.cs | 8 ++++----
 Octokit/Clients/IssuesClient.cs  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Octokit/Clients/IIssuesClient.cs b/Octokit/Clients/IIssuesClient.cs
index 63f5611d09..986162c305 100644
--- a/Octokit/Clients/IIssuesClient.cs
+++ b/Octokit/Clients/IIssuesClient.cs
@@ -315,7 +315,7 @@ public interface IIssuesClient
         Task<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate);
 
         /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
         /// <param name="owner">The owner of the repository</param>
@@ -325,7 +325,7 @@ public interface IIssuesClient
         Task Lock(string owner, string name, int number, LockReason? lockReason = null);
 
         /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
@@ -334,7 +334,7 @@ public interface IIssuesClient
         Task Lock(long repositoryId, int number, LockReason? lockReason = null);
 
         /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
         /// <param name="owner">The owner of the repository</param>
@@ -343,7 +343,7 @@ public interface IIssuesClient
         Task Unlock(string owner, string name, int number);
 
         /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
diff --git a/Octokit/Clients/IssuesClient.cs b/Octokit/Clients/IssuesClient.cs
index f6708029a2..88af678a09 100644
--- a/Octokit/Clients/IssuesClient.cs
+++ b/Octokit/Clients/IssuesClient.cs
@@ -494,7 +494,7 @@ public Task<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate
         }
 
         /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue  or pull request's conversation.
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
         /// <param name="owner">The owner of the repository</param>
@@ -540,7 +540,7 @@ public Task Unlock(string owner, string name, int number)
         }
 
         /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue  or pull request's conversation.
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
         /// <param name="repositoryId">The Id of the repository</param>

From daa86644d81cd1081f4264e2ae03943bae2bd180 Mon Sep 17 00:00:00 2001
From: notauserx <notauserx@users.noreply.github.com>
Date: Tue, 16 Aug 2022 12:55:11 +0600
Subject: [PATCH 3/6] refactor: extract lock and unlock from IIssuesClient
 create ILockUnlockClient so both IIssuesClient and IPullRequestClient can
 access lock and unlock methods.

---
 .../Clients/ObservableIssuesClient.cs         |  8 +-
 .../Clients/IssuesClientTests.cs              | 10 +--
 .../Clients/IssuesEventsClientTests.cs        | 72 +++++++++---------
 .../Clients/PullRequestsClientTests.cs        | 19 +++++
 Octokit.Tests/Clients/IssuesClientTests.cs    | 24 +++---
 .../Reactive/ObservableIssuesClientTests.cs   |  8 +-
 Octokit/Clients/IIssuesClient.cs              | 37 +--------
 Octokit/Clients/ILockUnlockClient.cs          | 47 ++++++++++++
 Octokit/Clients/IPullRequestsClient.cs        |  5 ++
 Octokit/Clients/IssuesClient.cs               | 66 ++--------------
 Octokit/Clients/LockUnlockClient.cs           | 76 +++++++++++++++++++
 Octokit/Clients/PullRequestsClient.cs         |  6 ++
 12 files changed, 223 insertions(+), 155 deletions(-)
 create mode 100644 Octokit/Clients/ILockUnlockClient.cs
 create mode 100644 Octokit/Clients/LockUnlockClient.cs

diff --git a/Octokit.Reactive/Clients/ObservableIssuesClient.cs b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
index 2f2df7c915..a96713d3e1 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
@@ -486,7 +486,7 @@ public IObservable<Unit> Lock(string owner, string name, int number, LockReason?
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return _client.Lock(owner, name, number, lockReason).ToObservable();
+            return _client.LockUnlock.Lock(owner, name, number, lockReason).ToObservable();
         }
 
         /// <summary>
@@ -498,7 +498,7 @@ public IObservable<Unit> Lock(string owner, string name, int number, LockReason?
         /// <param name="lockReason">The reason for locking the issue</param>
         public IObservable<Unit> Lock(long repositoryId, int number, LockReason? lockReason = null)
         {
-            return _client.Lock(repositoryId, number, lockReason).ToObservable();
+            return _client.LockUnlock.Lock(repositoryId, number, lockReason).ToObservable();
         }
 
         /// <summary>
@@ -513,7 +513,7 @@ public IObservable<Unit> Unlock(string owner, string name, int number)
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return _client.Unlock(owner, name, number).ToObservable();
+            return _client.LockUnlock.Unlock(owner, name, number).ToObservable();
         }
 
         /// <summary>
@@ -524,7 +524,7 @@ public IObservable<Unit> Unlock(string owner, string name, int number)
         /// <param name="number">The issue number</param>
         public IObservable<Unit> Unlock(long repositoryId, int number)
         {
-            return _client.Unlock(repositoryId, number).ToObservable();
+            return _client.LockUnlock.Unlock(repositoryId, number).ToObservable();
         }
     }
 }
diff --git a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
index 16bf28f76f..2a92b35b59 100644
--- a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
@@ -241,12 +241,12 @@ public async Task CanLockAndUnlockIssue()
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
         Assert.False(issue.Locked);
 
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
         var retrieved = await _issuesClient.Get(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
         Assert.NotNull(retrieved);
         Assert.True(retrieved.Locked);
 
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
         retrieved = await _issuesClient.Get(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
         Assert.NotNull(retrieved);
         Assert.False(retrieved.Locked);
@@ -259,7 +259,7 @@ public async Task CanAccessActiveLockReason()
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
         Assert.False(issue.Locked);
 
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number, LockReason.OffTopic);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number, LockReason.OffTopic);
         var retrieved = await _issuesClient.Get(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
         Assert.NotNull(retrieved);
         Assert.True(retrieved.Locked);
@@ -273,12 +273,12 @@ public async Task CanLockAndUnlockIssueWithRepositoryId()
         var issue = await _issuesClient.Create(_context.Repository.Id, newIssue);
         Assert.False(issue.Locked);
 
-        await _issuesClient.Lock(_context.Repository.Id, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.Repository.Id, issue.Number);
         var retrieved = await _issuesClient.Get(_context.Repository.Id, issue.Number);
         Assert.NotNull(retrieved);
         Assert.True(retrieved.Locked);
 
-        await _issuesClient.Unlock(_context.Repository.Id, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.Repository.Id, issue.Number);
         retrieved = await _issuesClient.Get(_context.Repository.Id, issue.Number);
         Assert.NotNull(retrieved);
         Assert.False(retrieved.Locked);
diff --git a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
index 9daa2834fd..a223d65e60 100644
--- a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
@@ -63,9 +63,9 @@ public async Task ReturnsCorrectCountOfEventInfosWithoutStart()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var options = new ApiOptions
         {
@@ -83,9 +83,9 @@ public async Task ReturnsCorrectCountOfEventInfosWithoutStartWithRepositoryId()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var options = new ApiOptions
         {
@@ -103,9 +103,9 @@ public async Task ReturnsCorrectCountOfEventInfosWithStart()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var options = new ApiOptions
         {
@@ -124,9 +124,9 @@ public async Task ReturnsCorrectCountOfEventInfosWithStartWithRepositoryId()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var options = new ApiOptions
         {
@@ -145,9 +145,9 @@ public async Task ReturnsDistinctEventInfosBasedOnStartPage()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var startOptions = new ApiOptions
         {
@@ -174,9 +174,9 @@ public async Task ReturnsDistinctEventInfosBasedOnStartPageWithRepositoryId()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var startOptions = new ApiOptions
         {
@@ -259,9 +259,9 @@ public async Task ReturnsCorrectCountOfIssueEventsWithoutStart()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var options = new ApiOptions
         {
@@ -279,9 +279,9 @@ public async Task ReturnsCorrectCountOfIssueEventsWithoutStartWithRepositoryId()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var options = new ApiOptions
         {
@@ -299,9 +299,9 @@ public async Task ReturnsCorrectCountOfIssueEventsWithStart()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var options = new ApiOptions
         {
@@ -320,9 +320,9 @@ public async Task ReturnsCorrectCountOfIssueEventsWithStartWithRepositoryId()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var options = new ApiOptions
         {
@@ -341,9 +341,9 @@ public async Task ReturnsDistinctIssueEventsBasedOnStartPage()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var startOptions = new ApiOptions
         {
@@ -370,9 +370,9 @@ public async Task ReturnsDistinctIssueEventsBasedOnStartPageWithRepositoryId()
     {
         var newIssue = new NewIssue("issue 1") { Body = "A new unassigned issue" };
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-        await _issuesClient.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
+        await _issuesClient.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
         var startOptions = new ApiOptions
         {
diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
index 8985e28b32..dfe866fca0 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
@@ -653,6 +653,25 @@ public async Task CanClose()
         Assert.Equal(pullRequest.Body, result.Body);
     }
 
+    [IntegrationTest]
+    public async Task CanLockAndUnlock()
+    {
+        await CreateTheWorld();
+
+        var newPullRequest = new NewPullRequest("a pull request to lock", branchName, "main");
+        var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest);
+
+        await _fixture.LockUnlock.Lock(Helper.UserName, _context.RepositoryName, pullRequest.Number, LockReason.OffTopic);
+        var retrived = await _fixture.Get(Helper.UserName, _context.RepositoryName, pullRequest.Number);
+
+        Assert.Equal(retrived.ActiveLockReason, LockReason.OffTopic);
+
+        await _fixture.LockUnlock.Unlock(Helper.UserName, _context.RepositoryName, pullRequest.Number);
+        var unlocked = await _fixture.Get(Helper.UserName, _context.RepositoryName, pullRequest.Number);
+
+        Assert.Equal(unlocked.ActiveLockReason, null);
+    }
+
     [IntegrationTest]
     public async Task CanFindClosedPullRequest()
     {
diff --git a/Octokit.Tests/Clients/IssuesClientTests.cs b/Octokit.Tests/Clients/IssuesClientTests.cs
index 5eaceb81d7..6cfc3e783f 100644
--- a/Octokit.Tests/Clients/IssuesClientTests.cs
+++ b/Octokit.Tests/Clients/IssuesClientTests.cs
@@ -478,7 +478,7 @@ public void PostsToCorrectUrl()
                 var connection = Substitute.For<IApiConnection>();
                 var client = new IssuesClient(connection);
 
-                client.Lock("fake", "repo", 42);
+                client.LockUnlock.Lock("fake", "repo", 42);
 
                 connection.Received().Put<Issue>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/42/lock"), Arg.Any<object>());
             }
@@ -489,7 +489,7 @@ public void PostsToCorrectUrlWithRepositoryId()
                 var connection = Substitute.For<IApiConnection>();
                 var client = new IssuesClient(connection);
 
-                client.Lock(1, 42);
+                client.LockUnlock.Lock(1, 42);
 
                 connection.Received().Put<Issue>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/42/lock"), Arg.Any<object>());
             }
@@ -500,11 +500,11 @@ public async Task EnsuresNonNullArguments()
                 var connection = Substitute.For<IApiConnection>();
                 var client = new IssuesClient(connection);
 
-                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Lock(null, "name", 1));
-                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Lock("owner", null, 1));
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.LockUnlock.Lock(null, "name", 1));
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.LockUnlock.Lock("owner", null, 1));
 
-                await Assert.ThrowsAsync<ArgumentException>(() => client.Lock("", "name", 1));
-                await Assert.ThrowsAsync<ArgumentException>(() => client.Lock("owner", "", 1));
+                await Assert.ThrowsAsync<ArgumentException>(() => client.LockUnlock.Lock("", "name", 1));
+                await Assert.ThrowsAsync<ArgumentException>(() => client.LockUnlock.Lock("owner", "", 1));
             }
         }
 
@@ -516,7 +516,7 @@ public void PostsToCorrectUrl()
                 var connection = Substitute.For<IApiConnection>();
                 var client = new IssuesClient(connection);
 
-                client.Unlock("fake", "repo", 42);
+                client.LockUnlock.Unlock("fake", "repo", 42);
 
                 connection.Received().Delete(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/42/lock"));
             }
@@ -527,7 +527,7 @@ public void PostsToCorrectUrlWithApiOptions()
                 var connection = Substitute.For<IApiConnection>();
                 var client = new IssuesClient(connection);
 
-                client.Unlock(1, 42);
+                client.LockUnlock.Unlock(1, 42);
 
                 connection.Received().Delete(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/42/lock"));
             }
@@ -538,11 +538,11 @@ public async Task EnsuresNonNullArguments()
                 var connection = Substitute.For<IApiConnection>();
                 var client = new IssuesClient(connection);
 
-                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Unlock(null, "name", 1));
-                await Assert.ThrowsAsync<ArgumentNullException>(() => client.Unlock("owner", null, 1));
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.LockUnlock.Unlock(null, "name", 1));
+                await Assert.ThrowsAsync<ArgumentNullException>(() => client.LockUnlock.Unlock("owner", null, 1));
 
-                await Assert.ThrowsAsync<ArgumentException>(() => client.Unlock("", "name", 1));
-                await Assert.ThrowsAsync<ArgumentException>(() => client.Unlock("owner", "", 1));
+                await Assert.ThrowsAsync<ArgumentException>(() => client.LockUnlock.Unlock("", "name", 1));
+                await Assert.ThrowsAsync<ArgumentException>(() => client.LockUnlock.Unlock("owner", "", 1));
             }
         }
 
diff --git a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
index 347f17ad9f..83a7c2d727 100644
--- a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
@@ -647,7 +647,7 @@ public void LocksIssue()
 
             client.Lock("fake", "repo", 42);
 
-            gitHubClient.Issue.Received().Lock("fake", "repo", 42);
+            gitHubClient.Issue.Received().LockUnlock.Lock("fake", "repo", 42);
         }
 
         [Fact]
@@ -658,7 +658,7 @@ public void LocksIssueWithRepositoryId()
 
             client.Lock(1, 42);
 
-            gitHubClient.Issue.Received().Lock(1, 42);
+            gitHubClient.Issue.Received().LockUnlock.Lock(1, 42);
         }
 
         [Fact]
@@ -685,7 +685,7 @@ public void UnlocksIssue()
 
             client.Unlock("fake", "repo", 42);
 
-            gitHubClient.Issue.Received().Unlock("fake", "repo", 42);
+            gitHubClient.Issue.Received().LockUnlock.Unlock("fake", "repo", 42);
         }
 
         [Fact]
@@ -696,7 +696,7 @@ public void UnlocksIssueWithRepositoryId()
 
             client.Unlock(1, 42);
 
-            gitHubClient.Issue.Received().Unlock(1, 42);
+            gitHubClient.Issue.Received().LockUnlock.Unlock(1, 42);
         }
 
         [Fact]
diff --git a/Octokit/Clients/IIssuesClient.cs b/Octokit/Clients/IIssuesClient.cs
index 986162c305..c8dc2c1acd 100644
--- a/Octokit/Clients/IIssuesClient.cs
+++ b/Octokit/Clients/IIssuesClient.cs
@@ -41,6 +41,8 @@ public interface IIssuesClient
 
         IIssueTimelineClient Timeline { get; }
 
+        ILockUnlockClient LockUnlock { get; }
+
         /// <summary>
         /// Gets a single Issue by number.
         /// </summary>
@@ -314,40 +316,5 @@ public interface IIssuesClient
         /// </param>
         Task<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate);
 
-        /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
-        /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
-        /// <param name="lockReason">The reason for locking the issue</param>
-        Task Lock(string owner, string name, int number, LockReason? lockReason = null);
-
-        /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
-        /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
-        /// <param name="lockReason">The reason for locking the issue</param>
-        Task Lock(long repositoryId, int number, LockReason? lockReason = null);
-
-        /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
-        /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
-        Task Unlock(string owner, string name, int number);
-
-        /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
-        /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
-        Task Unlock(long repositoryId, int number);
     }
 }
\ No newline at end of file
diff --git a/Octokit/Clients/ILockUnlockClient.cs b/Octokit/Clients/ILockUnlockClient.cs
new file mode 100644
index 0000000000..da5f6ff86c
--- /dev/null
+++ b/Octokit/Clients/ILockUnlockClient.cs
@@ -0,0 +1,47 @@
+using System.Threading.Tasks;
+
+namespace Octokit
+{
+    /// <summary>
+    /// Client to manage locking/unlocking a conversation for an Issue or a Pull request
+    /// </summary>
+    public interface ILockUnlockClient
+    {
+        /// <summary>
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="number">The issue number</param>
+        /// <param name="lockReason">The reason for locking the issue</param>
+        Task Lock(string owner, string name, int number, LockReason? lockReason = null);
+
+        /// <summary>
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
+        /// <param name="repositoryId">The Id of the repository</param>
+        /// <param name="number">The issue number</param>
+        /// <param name="lockReason">The reason for locking the issue</param>
+        Task Lock(long repositoryId, int number, LockReason? lockReason = null);
+
+        /// <summary>
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="number">The issue number</param>
+        Task Unlock(string owner, string name, int number);
+
+        /// <summary>
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
+        /// <param name="repositoryId">The Id of the repository</param>
+        /// <param name="number">The issue number</param>
+        Task Unlock(long repositoryId, int number);
+
+    }
+}
diff --git a/Octokit/Clients/IPullRequestsClient.cs b/Octokit/Clients/IPullRequestsClient.cs
index 639c9c4f7c..e35d22d6e7 100644
--- a/Octokit/Clients/IPullRequestsClient.cs
+++ b/Octokit/Clients/IPullRequestsClient.cs
@@ -28,6 +28,11 @@ public interface IPullRequestsClient
         /// </summary>
         IPullRequestReviewRequestsClient ReviewRequest { get; }
 
+        /// <summary>
+        /// Client for locking/unlocking a coversation on a pull request
+        /// </summary>
+        ILockUnlockClient LockUnlock { get; }
+
         /// <summary>
         /// Get a pull request by number.
         /// </summary>
diff --git a/Octokit/Clients/IssuesClient.cs b/Octokit/Clients/IssuesClient.cs
index 88af678a09..01c8c4d5fc 100644
--- a/Octokit/Clients/IssuesClient.cs
+++ b/Octokit/Clients/IssuesClient.cs
@@ -23,6 +23,7 @@ public IssuesClient(IApiConnection apiConnection) : base(apiConnection)
             Milestone = new MilestonesClient(apiConnection);
             Comment = new IssueCommentsClient(apiConnection);
             Timeline = new IssueTimelineClient(apiConnection);
+            LockUnlock = new LockUnlockClient(apiConnection);
         }
 
         /// <summary>
@@ -57,6 +58,11 @@ public IssuesClient(IApiConnection apiConnection) : base(apiConnection)
         /// </summary>
         public IIssueTimelineClient Timeline { get; private set; }
 
+        /// <summary>
+        /// Client for locking and unlocking a conversation on a Issue or Pull request
+        /// </summary>
+        public ILockUnlockClient LockUnlock { get; private set; }
+
         /// <summary>
         /// Gets a single Issue by number.
         /// </summary>
@@ -491,64 +497,6 @@ public Task<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate
             Ensure.ArgumentNotNull(issueUpdate, nameof(issueUpdate));
 
             return ApiConnection.Patch<Issue>(ApiUrls.Issue(repositoryId, number), issueUpdate);
-        }
-
-        /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
-        /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
-        /// <param name="lockReason">The reason for locking the issue</param>
-        [ManualRoute("PUT", "/repos/{owner}/{repo}/issues/{issue_number}/lock")]
-        public Task Lock(string owner, string name, int number, LockReason? lockReason = null)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
-
-            return ApiConnection.Put<Issue>(ApiUrls.IssueLock(owner, name, number), lockReason.HasValue ? new { LockReason = lockReason } : new object());
-        }
-
-        /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
-        /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
-        /// <param name="lockReason">The reason for locking the issue</param>
-        [ManualRoute("PUT", "/repositories/{id}/issues/{number}/lock")]
-        public Task Lock(long repositoryId, int number, LockReason? lockReason = null)
-        {
-            return ApiConnection.Put<Issue>(ApiUrls.IssueLock(repositoryId, number), lockReason.HasValue ? new { LockReaons = lockReason } : new object());
-        }
-
-        /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
-        /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
-        [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/{issue_number}/lock")]
-        public Task Unlock(string owner, string name, int number)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
-
-            return ApiConnection.Delete(ApiUrls.IssueLock(owner, name, number));
-        }
-
-        /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
-        /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
-        [ManualRoute("DELETE", "/repositories/{id}/issues/{number}/lock")]
-        public Task Unlock(long repositoryId, int number)
-        {
-            return ApiConnection.Delete(ApiUrls.IssueLock(repositoryId, number));
-        }
+        }        
     }
 }
diff --git a/Octokit/Clients/LockUnlockClient.cs b/Octokit/Clients/LockUnlockClient.cs
new file mode 100644
index 0000000000..4acf702da3
--- /dev/null
+++ b/Octokit/Clients/LockUnlockClient.cs
@@ -0,0 +1,76 @@
+using System.Threading.Tasks;
+
+namespace Octokit
+{
+    /// <summary>
+    /// Client to manage locking/unlocking a conversation for an Issue or a Pull request
+    /// </summary>
+    public class LockUnlockClient : ApiClient, ILockUnlockClient
+    {
+        /// <summary>
+        /// Instantiates a new GitHub Issue Lock API client.
+        /// </summary>
+        /// <param name="apiConnection">An API connection</param>
+        public LockUnlockClient(IApiConnection apiConnection) : base(apiConnection)
+        {
+
+        }
+        /// <summary>
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="number">The issue number</param>
+        /// <param name="lockReason">The reason for locking the issue</param>
+        [ManualRoute("PUT", "/repos/{owner}/{repo}/issues/{issue_number}/lock")]
+        public Task Lock(string owner, string name, int number, LockReason? lockReason = null)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+
+            return ApiConnection.Put<Issue>(ApiUrls.IssueLock(owner, name, number), lockReason.HasValue ? new { LockReason = lockReason } : new object());
+        }
+
+        /// <summary>
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue or pull request's conversation.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
+        /// <param name="repositoryId">The Id of the repository</param>
+        /// <param name="number">The issue number</param>
+        /// <param name="lockReason">The reason for locking the issue</param>
+        [ManualRoute("PUT", "/repositories/{id}/issues/{number}/lock")]
+        public Task Lock(long repositoryId, int number, LockReason? lockReason = null)
+        {
+            return ApiConnection.Put<Issue>(ApiUrls.IssueLock(repositoryId, number), lockReason.HasValue ? new { LockReaons = lockReason } : new object());
+        }
+
+        /// <summary>
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="number">The issue number</param>
+        [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/{issue_number}/lock")]
+        public Task Unlock(string owner, string name, int number)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+
+            return ApiConnection.Delete(ApiUrls.IssueLock(owner, name, number));
+        }
+
+        /// <summary>
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue or pull request's conversation.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
+        /// <param name="repositoryId">The Id of the repository</param>
+        /// <param name="number">The issue number</param>
+        [ManualRoute("DELETE", "/repositories/{id}/issues/{number}/lock")]
+        public Task Unlock(long repositoryId, int number)
+        {
+            return ApiConnection.Delete(ApiUrls.IssueLock(repositoryId, number));
+        }
+    }
+}
diff --git a/Octokit/Clients/PullRequestsClient.cs b/Octokit/Clients/PullRequestsClient.cs
index 07c63b9748..34bf1cda62 100644
--- a/Octokit/Clients/PullRequestsClient.cs
+++ b/Octokit/Clients/PullRequestsClient.cs
@@ -18,6 +18,7 @@ public PullRequestsClient(IApiConnection apiConnection) : base(apiConnection)
             Review = new PullRequestReviewsClient(apiConnection);
             ReviewComment = new PullRequestReviewCommentsClient(apiConnection);
             ReviewRequest = new PullRequestReviewRequestsClient(apiConnection);
+            LockUnlock = new LockUnlockClient(apiConnection);
         }
 
         /// <summary>
@@ -35,6 +36,11 @@ public PullRequestsClient(IApiConnection apiConnection) : base(apiConnection)
         /// </summary>
         public IPullRequestReviewRequestsClient ReviewRequest { get; set; }
 
+        /// <summary>
+        /// Client for locking/unlocking a coversation on a pull request
+        /// </summary>
+        public ILockUnlockClient LockUnlock { get; set; }
+
         /// <summary>
         /// Get a pull request by number.
         /// </summary>

From de7bdcc32e41f3dfe2b610011fa48174df210aba Mon Sep 17 00:00:00 2001
From: notauserx <notauserx@users.noreply.github.com>
Date: Tue, 16 Aug 2022 21:26:17 +0600
Subject: [PATCH 4/6] refactor LockUnlock for reactive clients

---
 .../Clients/IObservableIssuesClient.cs        | 41 ++--------
 .../Clients/IObservableLockUnlockClient.cs    | 47 ++++++++++++
 .../Clients/IObservablePullRequestsClient.cs  |  5 ++
 .../Clients/ObservableIssuesClient.cs         | 60 ++-------------
 .../Clients/ObservableLockUnlockClient.cs     | 75 +++++++++++++++++++
 .../Clients/ObservablePullRequestsClient.cs   |  6 ++
 .../Reactive/ObservableIssuesClientTests.cs   |  4 +-
 .../Reactive/ObservableIssuesClientTests.cs   | 24 +++---
 8 files changed, 159 insertions(+), 103 deletions(-)
 create mode 100644 Octokit.Reactive/Clients/IObservableLockUnlockClient.cs
 create mode 100644 Octokit.Reactive/Clients/ObservableLockUnlockClient.cs

diff --git a/Octokit.Reactive/Clients/IObservableIssuesClient.cs b/Octokit.Reactive/Clients/IObservableIssuesClient.cs
index 3081488e98..8057f9e23e 100644
--- a/Octokit.Reactive/Clients/IObservableIssuesClient.cs
+++ b/Octokit.Reactive/Clients/IObservableIssuesClient.cs
@@ -44,6 +44,11 @@ public interface IObservableIssuesClient
         /// </summary>
         IObservableIssueTimelineClient Timeline { get; }
 
+        /// <summary>
+        /// Client for locking/unlocking conversation on an issue
+        /// </summary>
+        IObservableLockUnlockClient LockUnlock { get; }
+
         /// <summary>
         /// Gets a single Issue by number.
         /// </summary>
@@ -316,41 +321,5 @@ public interface IObservableIssuesClient
         /// <param name="issueUpdate">An <see cref="IssueUpdate"/> instance describing the changes to make to the issue
         /// </param>
         IObservable<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate);
-
-        /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
-        /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
-        /// <param name="lockReason">The reason for locking the issue</param>
-        IObservable<Unit> Lock(string owner, string name, int number, LockReason? lockReason = null);
-
-        /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
-        /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
-        /// <param name="lockReason">The reason for locking the issue</param>
-        IObservable<Unit> Lock(long repositoryId, int number, LockReason? lockReason = null);
-
-        /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
-        /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
-        IObservable<Unit> Unlock(string owner, string name, int number);
-
-        /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
-        /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
-        IObservable<Unit> Unlock(long repositoryId, int number);
     }
 }
\ No newline at end of file
diff --git a/Octokit.Reactive/Clients/IObservableLockUnlockClient.cs b/Octokit.Reactive/Clients/IObservableLockUnlockClient.cs
new file mode 100644
index 0000000000..b897141b59
--- /dev/null
+++ b/Octokit.Reactive/Clients/IObservableLockUnlockClient.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Reactive;
+
+namespace Octokit.Reactive
+{
+    /// <summary>
+    /// Client to manage locking/unlocking a conversation for an Issue or a Pull request
+    /// </summary>
+    public interface IObservableLockUnlockClient
+    {
+        /// <summary>
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="number">The issue number</param>
+        /// <param name="lockReason">The reason for locking the issue</param>
+        IObservable<Unit> Lock(string owner, string name, int number, LockReason? lockReason = null);
+
+        /// <summary>
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
+        /// <param name="repositoryId">The Id of the repository</param>
+        /// <param name="number">The issue number</param>
+        /// <param name="lockReason">The reason for locking the issue</param>
+        IObservable<Unit> Lock(long repositoryId, int number, LockReason? lockReason = null);
+
+        /// <summary>
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="number">The issue number</param>
+        IObservable<Unit> Unlock(string owner, string name, int number);
+
+        /// <summary>
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
+        /// <param name="repositoryId">The Id of the repository</param>
+        /// <param name="number">The issue number</param>
+        IObservable<Unit> Unlock(long repositoryId, int number);
+    }
+}
diff --git a/Octokit.Reactive/Clients/IObservablePullRequestsClient.cs b/Octokit.Reactive/Clients/IObservablePullRequestsClient.cs
index 007886afcf..997d662212 100644
--- a/Octokit.Reactive/Clients/IObservablePullRequestsClient.cs
+++ b/Octokit.Reactive/Clients/IObservablePullRequestsClient.cs
@@ -26,6 +26,11 @@ public interface IObservablePullRequestsClient
         /// </summary>
         IObservablePullRequestReviewRequestsClient ReviewRequest { get; }
 
+        /// <summary>
+        /// Client for locking/unlocking a conversation on a pull request
+        /// </summary>
+        IObservableLockUnlockClient LockUnlock { get; }
+
         /// <summary>
         /// Gets a single Pull Request by number.
         /// </summary>
diff --git a/Octokit.Reactive/Clients/ObservableIssuesClient.cs b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
index a96713d3e1..033408d31c 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
@@ -48,6 +48,11 @@ public class ObservableIssuesClient : IObservableIssuesClient
         /// </summary>
         public IObservableIssueTimelineClient Timeline { get; private set; }
 
+        /// <summary>
+        /// Client for locking/unlocking conversation on an issue
+        /// </summary>
+        public IObservableLockUnlockClient LockUnlock { get; protected set; }
+
         public ObservableIssuesClient(IGitHubClient client)
         {
             Ensure.ArgumentNotNull(client, nameof(client));
@@ -60,6 +65,7 @@ public ObservableIssuesClient(IGitHubClient client)
             Milestone = new ObservableMilestonesClient(client);
             Comment = new ObservableIssueCommentsClient(client);
             Timeline = new ObservableIssueTimelineClient(client);
+            LockUnlock = new ObservableLockUnlockClient(client);
         }
 
         /// <summary>
@@ -473,58 +479,6 @@ public IObservable<Issue> Update(long repositoryId, int number, IssueUpdate issu
             return _client.Update(repositoryId, number, issueUpdate).ToObservable();
         }
 
-        /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
-        /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
-        /// <param name="lockReason">The reason for locking the issue</param>
-        public IObservable<Unit> Lock(string owner, string name, int number, LockReason? lockReason = null)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
-
-            return _client.LockUnlock.Lock(owner, name, number, lockReason).ToObservable();
-        }
-
-        /// <summary>
-        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
-        /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
-        /// <param name="lockReason">The reason for locking the issue</param>
-        public IObservable<Unit> Lock(long repositoryId, int number, LockReason? lockReason = null)
-        {
-            return _client.LockUnlock.Lock(repositoryId, number, lockReason).ToObservable();
-        }
-
-        /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
-        /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
-        public IObservable<Unit> Unlock(string owner, string name, int number)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
-
-            return _client.LockUnlock.Unlock(owner, name, number).ToObservable();
-        }
-
-        /// <summary>
-        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
-        /// </summary>
-        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
-        /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
-        public IObservable<Unit> Unlock(long repositoryId, int number)
-        {
-            return _client.LockUnlock.Unlock(repositoryId, number).ToObservable();
-        }
+        
     }
 }
diff --git a/Octokit.Reactive/Clients/ObservableLockUnlockClient.cs b/Octokit.Reactive/Clients/ObservableLockUnlockClient.cs
new file mode 100644
index 0000000000..3010741a8c
--- /dev/null
+++ b/Octokit.Reactive/Clients/ObservableLockUnlockClient.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Reactive;
+using System.Reactive.Threading.Tasks;
+
+namespace Octokit.Reactive
+{
+    /// <summary>
+    /// Client to manage locking/unlocking a conversation for an Issue or a Pull request
+    /// </summary>
+    public class ObservableLockUnlockClient : IObservableLockUnlockClient
+    {
+        readonly ILockUnlockClient _client;
+
+        public ObservableLockUnlockClient(IGitHubClient client)
+        {
+            Ensure.ArgumentNotNull(client, nameof(client));
+
+            _client = client.Issue.LockUnlock;
+        }
+
+        /// <summary>
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="number">The issue number</param>
+        /// <param name="lockReason">The reason for locking the issue</param>
+        public IObservable<Unit> Lock(string owner, string name, int number, LockReason? lockReason = null)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+
+            return _client.Lock(owner, name, number, lockReason).ToObservable();
+        }
+
+        /// <summary>
+        /// Locks an issue for the specified repository. Issue owners and users with push access can lock an issue.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#lock-an-issue</remarks>
+        /// <param name="repositoryId">The Id of the repository</param>
+        /// <param name="number">The issue number</param>
+        /// <param name="lockReason">The reason for locking the issue</param>
+        public IObservable<Unit> Lock(long repositoryId, int number, LockReason? lockReason = null)
+        {
+            return _client.Lock(repositoryId, number, lockReason).ToObservable();
+        }
+
+        /// <summary>
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
+        /// <param name="owner">The owner of the repository</param>
+        /// <param name="name">The name of the repository</param>
+        /// <param name="number">The issue number</param>
+        public IObservable<Unit> Unlock(string owner, string name, int number)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+
+            return _client.Unlock(owner, name, number).ToObservable();
+        }
+
+        /// <summary>
+        /// Unlocks an issue for the specified repository. Issue owners and users with push access can unlock an issue.
+        /// </summary>
+        /// <remarks>https://developer.github.com/v3/issues/#unlock-an-issue</remarks>
+        /// <param name="repositoryId">The Id of the repository</param>
+        /// <param name="number">The issue number</param>
+        public IObservable<Unit> Unlock(long repositoryId, int number)
+        {
+            return _client.Unlock(repositoryId, number).ToObservable();
+        }
+    }
+}
diff --git a/Octokit.Reactive/Clients/ObservablePullRequestsClient.cs b/Octokit.Reactive/Clients/ObservablePullRequestsClient.cs
index 9fbafba8ba..0f34376011 100644
--- a/Octokit.Reactive/Clients/ObservablePullRequestsClient.cs
+++ b/Octokit.Reactive/Clients/ObservablePullRequestsClient.cs
@@ -30,6 +30,11 @@ public class ObservablePullRequestsClient : IObservablePullRequestsClient
         /// </summary>
         public IObservablePullRequestReviewRequestsClient ReviewRequest { get; private set; }
 
+        /// <summary>
+        /// Client for locking/unlocking a conversation on a pull request
+        /// </summary>
+        public IObservableLockUnlockClient LockUnlock { get; private set; }
+
         public ObservablePullRequestsClient(IGitHubClient client)
         {
             Ensure.ArgumentNotNull(client, nameof(client));
@@ -39,6 +44,7 @@ public ObservablePullRequestsClient(IGitHubClient client)
             Review = new ObservablePullRequestReviewsClient(client);
             ReviewComment = new ObservablePullRequestReviewCommentsClient(client);
             ReviewRequest = new ObservablePullRequestReviewRequestsClient(client);
+            LockUnlock = new ObservableLockUnlockClient(client);
         }
 
         /// <summary>
diff --git a/Octokit.Tests.Integration/Reactive/ObservableIssuesClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableIssuesClientTests.cs
index bedb3d3791..146228e980 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableIssuesClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableIssuesClientTests.cs
@@ -118,11 +118,11 @@ public async Task CanLockAndUnlockIssues()
         var createResult = await _client.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
         Assert.False(createResult.Locked);
 
-        await _client.Lock(_context.RepositoryOwner, _context.RepositoryName, createResult.Number);
+        await _client.LockUnlock.Lock(_context.RepositoryOwner, _context.RepositoryName, createResult.Number);
         var lockResult = await _client.Get(_context.RepositoryOwner, _context.RepositoryName, createResult.Number);
         Assert.True(lockResult.Locked);
 
-        await _client.Unlock(_context.RepositoryOwner, _context.RepositoryName, createResult.Number);
+        await _client.LockUnlock.Unlock(_context.RepositoryOwner, _context.RepositoryName, createResult.Number);
         var unlockIssueResult = await _client.Get(_context.RepositoryOwner, _context.RepositoryName, createResult.Number);
         Assert.False(unlockIssueResult.Locked);
     }
diff --git a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
index 83a7c2d727..6245620aab 100644
--- a/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableIssuesClientTests.cs
@@ -645,7 +645,7 @@ public void LocksIssue()
             var gitHubClient = Substitute.For<IGitHubClient>();
             var client = new ObservableIssuesClient(gitHubClient);
 
-            client.Lock("fake", "repo", 42);
+            client.LockUnlock.Lock("fake", "repo", 42);
 
             gitHubClient.Issue.Received().LockUnlock.Lock("fake", "repo", 42);
         }
@@ -656,7 +656,7 @@ public void LocksIssueWithRepositoryId()
             var gitHubClient = Substitute.For<IGitHubClient>();
             var client = new ObservableIssuesClient(gitHubClient);
 
-            client.Lock(1, 42);
+            client.LockUnlock.Lock(1, 42);
 
             gitHubClient.Issue.Received().LockUnlock.Lock(1, 42);
         }
@@ -667,11 +667,11 @@ public void EnsuresNonNullArguments()
             var gitHubClient = Substitute.For<IGitHubClient>();
             var client = new ObservableIssuesClient(gitHubClient);
 
-            Assert.Throws<ArgumentNullException>(() => client.Lock(null, "name", 42));
-            Assert.Throws<ArgumentNullException>(() => client.Lock("owner", null, 42));
+            Assert.Throws<ArgumentNullException>(() => client.LockUnlock.Lock(null, "name", 42));
+            Assert.Throws<ArgumentNullException>(() => client.LockUnlock.Lock("owner", null, 42));
 
-            Assert.Throws<ArgumentException>(() => client.Lock("", "name", 42));
-            Assert.Throws<ArgumentException>(() => client.Lock("owner", "", 42));
+            Assert.Throws<ArgumentException>(() => client.LockUnlock.Lock("", "name", 42));
+            Assert.Throws<ArgumentException>(() => client.LockUnlock.Lock("owner", "", 42));
         }
     }
 
@@ -683,7 +683,7 @@ public void UnlocksIssue()
             var gitHubClient = Substitute.For<IGitHubClient>();
             var client = new ObservableIssuesClient(gitHubClient);
 
-            client.Unlock("fake", "repo", 42);
+            client.LockUnlock.Unlock("fake", "repo", 42);
 
             gitHubClient.Issue.Received().LockUnlock.Unlock("fake", "repo", 42);
         }
@@ -694,7 +694,7 @@ public void UnlocksIssueWithRepositoryId()
             var gitHubClient = Substitute.For<IGitHubClient>();
             var client = new ObservableIssuesClient(gitHubClient);
 
-            client.Unlock(1, 42);
+            client.LockUnlock.Unlock(1, 42);
 
             gitHubClient.Issue.Received().LockUnlock.Unlock(1, 42);
         }
@@ -705,11 +705,11 @@ public void EnsuresNonNullArguments()
             var gitHubClient = Substitute.For<IGitHubClient>();
             var client = new ObservableIssuesClient(gitHubClient);
 
-            Assert.Throws<ArgumentNullException>(() => client.Unlock(null, "name", 42));
-            Assert.Throws<ArgumentNullException>(() => client.Unlock("owner", null, 42));
+            Assert.Throws<ArgumentNullException>(() => client.LockUnlock.Unlock(null, "name", 42));
+            Assert.Throws<ArgumentNullException>(() => client.LockUnlock.Unlock("owner", null, 42));
 
-            Assert.Throws<ArgumentException>(() => client.Unlock("", "name", 42));
-            Assert.Throws<ArgumentException>(() => client.Unlock("owner", "", 42));
+            Assert.Throws<ArgumentException>(() => client.LockUnlock.Unlock("", "name", 42));
+            Assert.Throws<ArgumentException>(() => client.LockUnlock.Unlock("owner", "", 42));
         }
     }
 

From 4851fe1537bf7b283f5c869139c9dcc9d43b30dc Mon Sep 17 00:00:00 2001
From: notauserx <notauserx@users.noreply.github.com>
Date: Wed, 17 Aug 2022 09:53:01 +0600
Subject: [PATCH 5/6] Update doc to include lock unlock sample code

---
 docs/issues.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/issues.md b/docs/issues.md
index 65804a422c..07e23caba3 100644
--- a/docs/issues.md
+++ b/docs/issues.md
@@ -120,3 +120,23 @@ Label changes probably requires some explanation:
 
 If you're trying to populate the `Labels` collection by hand, you might hit
 some exceptional behaviour due to these rules.
+
+### Lock / Unlock
+
+The lock and unlock methods are available on the ILockUnlockClient on IIssuesClient.
+
+Heres a sample code for locking an issue:
+
+```csharp
+var issue = await client.Issue.Get("octokit", "octokit.net", 405);
+await client.LockUnlock.Lock("octokit", "octokit.net", 405, LockReason.OffTopic);
+```
+
+The active lock reason can be accessed via the LockReason property on Issues class.
+
+The code below demonstrates how to unlock an issue:
+
+```csharp
+var issue = await client.Issue.Get("octokit", "octokit.net", 405);
+await client.LockUnlock.Unlock("octokit", "octokit.net", 405);
+```

From 20a6a7e3f90153e18d0dbd7b7bc3a545abcad2c1 Mon Sep 17 00:00:00 2001
From: notauserx <notauserx@users.noreply.github.com>
Date: Thu, 18 Aug 2022 08:47:59 +0600
Subject: [PATCH 6/6] Use Assert.Null to check null value in test

---
 Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
index dfe866fca0..d8c6cc410e 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
@@ -669,7 +669,7 @@ public async Task CanLockAndUnlock()
         await _fixture.LockUnlock.Unlock(Helper.UserName, _context.RepositoryName, pullRequest.Number);
         var unlocked = await _fixture.Get(Helper.UserName, _context.RepositoryName, pullRequest.Number);
 
-        Assert.Equal(unlocked.ActiveLockReason, null);
+        Assert.Null(unlocked.ActiveLockReason);
     }
 
     [IntegrationTest]