diff options
| author | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-05 23:50:56 +0000 |
|---|---|---|
| committer | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-05 23:50:56 +0000 |
| commit | 8adcc5993ddcb16ac29dac39c9063e2d0ca99bbe (patch) | |
| tree | 79b7602d735737c1ecea3023f362d0b519bf2459 | |
| parent | 029381b1d9219ad6fd5ed68f2f93e418f1dd55ca (diff) | |
| parent | 81f44275bd3882d2153357c1839561e5a6a53348 (diff) | |
| download | gitlab-ce-8adcc5993ddcb16ac29dac39c9063e2d0ca99bbe.tar.gz | |
Merge branch 'dblessing-fix-admin-user-radio-labels' into 'master'
Fix Admin area user access level radio button labels
See merge request gitlab-org/gitlab-ce!31154
| -rw-r--r-- | app/views/admin/users/_access_levels.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/dblessing-fix-admin-user-radio-labels.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/admin/users/_access_levels.html.haml b/app/views/admin/users/_access_levels.html.haml index 77729636f9d..bb1e22cc610 100644 --- a/app/views/admin/users/_access_levels.html.haml +++ b/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 diff --git a/changelogs/unreleased/dblessing-fix-admin-user-radio-labels.yml b/changelogs/unreleased/dblessing-fix-admin-user-radio-labels.yml new file mode 100644 index 00000000000..4f119d46a1f --- /dev/null +++ b/changelogs/unreleased/dblessing-fix-admin-user-radio-labels.yml @@ -0,0 +1,5 @@ +--- +title: Fix admin area user access level radio button labels +merge_request: 31154 +author: +type: fixed |