aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Api/Controllers/ActivityLogController.cs
diff options
context:
space:
mode:
authorcrobibero <cody@robibe.ro>2020-06-21 11:34:05 -0600
committercrobibero <cody@robibe.ro>2020-06-21 11:34:05 -0600
commit38788a1f1d3b605b2d4443c3467e345597a87697 (patch)
treebb42252d7d7c5c16f4fc431698e7504b75d76291 /Jellyfin.Api/Controllers/ActivityLogController.cs
parent45234e5ecd787c4d2e9aadae8459917f3baee045 (diff)
parent3bf19d1e938a13dd2a507a320b08a12793ff3443 (diff)
Merge remote-tracking branch 'upstream/api-migration' into api-library
Diffstat (limited to 'Jellyfin.Api/Controllers/ActivityLogController.cs')
-rw-r--r--Jellyfin.Api/Controllers/ActivityLogController.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/ActivityLogController.cs b/Jellyfin.Api/Controllers/ActivityLogController.cs
index 4ae7cf506..ec50fb022 100644
--- a/Jellyfin.Api/Controllers/ActivityLogController.cs
+++ b/Jellyfin.Api/Controllers/ActivityLogController.cs
@@ -1,6 +1,5 @@
-#pragma warning disable CA1801
-
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Jellyfin.Api.Constants;
using Jellyfin.Data.Entities;
@@ -41,6 +40,7 @@ namespace Jellyfin.Api.Controllers
/// <returns>A <see cref="QueryResult{ActivityLogEntry}"/> containing the log entries.</returns>
[HttpGet("Entries")]
[ProducesResponseType(StatusCodes.Status200OK)]
+ [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "hasUserId", Justification = "Imported from ServiceStack")]
public ActionResult<QueryResult<ActivityLogEntry>> GetLogEntries(
[FromQuery] int? startIndex,
[FromQuery] int? limit,