Merge branch 'develop' into develop-2.5

netbox/secrets/admin.py

@@ -1,11 +1,12 @@
 from django.contrib import admin, messages
 from django.shortcuts import redirect, render
 
+from netbox.admin import admin_site
 from .forms import ActivateUserKeyForm
 from .models import UserKey
 
 
-@admin.register(UserKey)
+@admin.register(UserKey, site=admin_site)
 class UserKeyAdmin(admin.ModelAdmin):
     actions = ['activate_selected']
     list_display = ['user', 'is_filled', 'is_active', 'created']