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 ![visiblity_consistency](/uploads/9cf9b517e25cd661ac61bdd7ca2d82f4/visiblity_consistency.png) #### After ![group_visibility_after](/uploads/7b317684d047716f2aa5e60d19a4281b/group_visibility_after.png) See merge request !4848

Merge branch 'fix/group-visibility-ui-in-app-settings' into 'master'
ebe21acc · Jacob Schatz · bcebdee7 · 7dc45236 · ebe21acc · ebe21acc
Commit ebe21acc authored Jun 28, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CHANGELOG CHANGELOG +2 -0

_form.html.haml app/views/admin/application_settings/_form.html.haml +1 -1

No files found.
--- 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

--- 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)