Merge remote-tracking branch 'origin/master'

This commit is contained in:
kennycud 2023-11-29 17:30:26 -08:00
commit 3c307f15b3
2 changed files with 2 additions and 5 deletions

View File

@ -268,10 +268,7 @@ public class AdminResource {
}
)
@ApiErrors({ApiError.REPOSITORY_ISSUE})
@SecurityRequirement(name = "apiKey")
public ActivitySummary summary(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
Security.checkApiCallAllowed(request);
public ActivitySummary summary() {
ActivitySummary summary = new ActivitySummary();
long now = NTP.getTime();

View File

@ -35,7 +35,7 @@ public class AdminApiTests extends ApiCommon {
// Set localAuthBypassEnabled to true, since we don't need to test authentication here
FieldUtils.writeField(Settings.getInstance(), "localAuthBypassEnabled", true, true);
assertNotNull(this.adminResource.summary("testApiKey"));
assertNotNull(this.adminResource.summary());
}
@Test