From 6719e5af4f0b86dfa65baf255f513f359e514271 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 22 Sep 2019 10:47:43 -0300 Subject: [PATCH] fix bad rebase --- .../Clients/Enterprise/EnterpriseManagementConsoleClient.cs | 2 -- Octokit/Helpers/UriExtensions.cs | 4 ---- Octokit/Http/Connection.cs | 1 + Octokit/Http/IConnection.cs | 1 + 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Octokit/Clients/Enterprise/EnterpriseManagementConsoleClient.cs b/Octokit/Clients/Enterprise/EnterpriseManagementConsoleClient.cs index 0f1a56ab..42cfa39a 100644 --- a/Octokit/Clients/Enterprise/EnterpriseManagementConsoleClient.cs +++ b/Octokit/Clients/Enterprise/EnterpriseManagementConsoleClient.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -29,7 +28,6 @@ namespace Octokit var endpoint = ApiUrls.EnterpriseManagementConsoleMaintenance(managementConsolePassword, ApiConnection.Connection.BaseAddress); - endpoint = CorrectEndpointForManagementConsole(endpoint); return ApiConnection.Get(endpoint); } diff --git a/Octokit/Helpers/UriExtensions.cs b/Octokit/Helpers/UriExtensions.cs index e12b8b34..98d52bc6 100644 --- a/Octokit/Helpers/UriExtensions.cs +++ b/Octokit/Helpers/UriExtensions.cs @@ -51,10 +51,6 @@ namespace Octokit var hasQueryString = uri.OriginalString.IndexOf("?", StringComparison.Ordinal); - string uriWithoutQuery = hasQueryString == -1 - ? uri.ToString() - : uri.OriginalString.Substring(0, hasQueryString); - string queryString; string uriWithoutQuery; if (uri.IsAbsoluteUri) diff --git a/Octokit/Http/Connection.cs b/Octokit/Http/Connection.cs index fd34e0ef..270685f8 100644 --- a/Octokit/Http/Connection.cs +++ b/Octokit/Http/Connection.cs @@ -573,6 +573,7 @@ namespace Octokit return SendData(uri, HttpMethod.Delete, data, accepts, null, CancellationToken.None); } + /// /// Performs an asynchronous HTTP DELETE request that expects an empty response. /// /// URI endpoint to send request to diff --git a/Octokit/Http/IConnection.cs b/Octokit/Http/IConnection.cs index 44197917..d7b3a03b 100644 --- a/Octokit/Http/IConnection.cs +++ b/Octokit/Http/IConnection.cs @@ -273,6 +273,7 @@ namespace Octokit /// Specifies accept response media type Task> Delete(Uri uri, object data, string accepts); + /// /// Performs an asynchronous HTTP DELETE request that returns a response. /// /// URI endpoint to send request to