Merge branch 'dblessing-fix-admin-user-radio-labels-ee' into 'master'

EE: Fix Admin area user access level radio button labels

See merge request gitlab-org/gitlab-ee!14844

app/views/admin/users/_access_levels.html.haml

@@ -19,7 +19,7 @@
       - editing_current_user = (current_user == @user)
 
       = f.radio_button :access_level, :regular, disabled: editing_current_user
-      = label_tag :regular, class: 'font-weight-bold' do
+      = f.label :access_level_regular, class: 'font-weight-bold' do
         Regular
       %p.light
         Regular users have access to their groups and projects
@@ -27,7 +27,7 @@
       = render_if_exists 'admin/users/auditor_access_level_radio', f: f, disabled: editing_current_user
 
       = f.radio_button :access_level, :admin, disabled: editing_current_user
-      = label_tag :admin, class: 'font-weight-bold' do
+      = f.label :access_level_admin, class: 'font-weight-bold' do
         Admin
       %p.light
         Administrators have access to all groups, projects and users and can manage all features in this installation

changelogs/unreleased/dblessing-fix-admin-user-radio-labels.yml

+---
+title: Fix admin area user access level radio button labels
+merge_request: 31154
+author:
+type: fixed

ee/app/views/admin/users/_auditor_access_level_radio.html.haml

@@ -2,7 +2,7 @@
 
 - if license_allows_auditor_user?
   = f.radio_button :access_level, :auditor, disabled: disabled
-  = label_tag :auditor, class: 'font-weight-bold' do
+  = f.label :access_level_auditor, class: 'font-weight-bold' do
     Auditor
   %p.light
     Auditors have read-only access to all groups, projects and users