diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-28 20:29:39 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-28 20:29:39 +0000 |
| commit | ebe21acc2a2f0a569e1e10314ac9407024becafb (patch) | |
| tree | 0488c9ff0c517ea2fbad7b12bd3102239ea12e3b | |
| parent | bcebdee751a76e858afd91ae256c7e6388ec8a7e (diff) | |
| parent | 7dc45236d9766e82a7d35e239385cd14f077e7d3 (diff) | |
| download | gitlab-ce-ebe21acc2a2f0a569e1e10314ac9407024becafb.tar.gz | |
Merge branch 'fix/group-visibility-ui-in-app-settings' into 'master'
Fix group visibility form layout in application settings
## What does this MR do?
This fixes UI consistency related to setting group visibility levels in application settings. See screenshots.
## Screenshots (if relevant)
#### Before
#### After
See merge request !4848
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 047debbcd2b..05566f36338 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -72,6 +72,8 @@ v 8.9.1 - Remove duplicate 'New Page' button on edit wiki page v 8.9.0 +v 8.9.0 (unreleased) + - Fix group visibility form layout in application settings - Fix builds API response not including commit data - Fix error when CI job variables key specified but not defined - Fix pipeline status when there are no builds in pipeline diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index c883e8f97da..30ab0717164 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -15,7 +15,7 @@ = f.label :default_snippet_visibility, class: 'control-label col-sm-2' .col-sm-10 = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new) - .form-group.group-visibility-level-holder + .form-group.project-visibility-level-holder = f.label :default_group_visibility, class: 'control-label col-sm-2' .col-sm-10 = render('shared/visibility_radios', model_method: :default_group_visibility, form: f, selected_level: @application_setting.default_group_visibility, form_model: Group.new) |