Put forms from expandable sections into fieldset to ensure proper animation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 34 insertions, 33 deletions

diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml
index e604a8795db..dd86c9ed2eb 100644
--- a/app/views/admin/application_settings/_account_and_limit.html.haml
+++ b/app/views/admin/application_settings/_account_and_limit.html.haml
@@ -1,38 +1,39 @@
 = form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
   = form_errors(@application_setting)
 
-  .form-group
-    .col-sm-offset-2.col-sm-10
-      .checkbox
-        = f.label :gravatar_enabled do
-          = f.check_box :gravatar_enabled
-          Gravatar enabled
-  .form-group
-    = f.label :default_projects_limit, class: 'control-label col-sm-2'
-    .col-sm-10
-      = f.number_field :default_projects_limit, class: 'form-control'
-  .form-group
-    = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'control-label col-sm-2'
-    .col-sm-10
-      = f.number_field :max_attachment_size, class: 'form-control'
-  .form-group
-    = f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2'
-    .col-sm-10
-      = f.number_field :session_expire_delay, class: 'form-control'
-      %span.help-block#session_expire_delay_help_block GitLab restart is required to apply changes
-  .form-group
-    = f.label :user_oauth_applications, 'User OAuth applications', class: 'control-label col-sm-2'
-    .col-sm-10
-      .checkbox
-        = f.label :user_oauth_applications do
-          = f.check_box :user_oauth_applications
-          Allow users to register any application to use GitLab as an OAuth provider
-  .form-group
-    = f.label :user_default_external, 'New users set to external', class: 'control-label col-sm-2'
-    .col-sm-10
-      .checkbox
-        = f.label :user_default_external do
-          = f.check_box :user_default_external
-          Newly registered users will by default be external
+  %fieldset
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :gravatar_enabled do
+            = f.check_box :gravatar_enabled
+            Gravatar enabled
+    .form-group
+      = f.label :default_projects_limit, class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.number_field :default_projects_limit, class: 'form-control'
+    .form-group
+      = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.number_field :max_attachment_size, class: 'form-control'
+    .form-group
+      = f.label :session_expire_delay, 'Session duration (minutes)', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.number_field :session_expire_delay, class: 'form-control'
+        %span.help-block#session_expire_delay_help_block GitLab restart is required to apply changes
+    .form-group
+      = f.label :user_oauth_applications, 'User OAuth applications', class: 'control-label col-sm-2'
+      .col-sm-10
+        .checkbox
+          = f.label :user_oauth_applications do
+            = f.check_box :user_oauth_applications
+            Allow users to register any application to use GitLab as an OAuth provider
+    .form-group
+      = f.label :user_default_external, 'New users set to external', class: 'control-label col-sm-2'
+      .col-sm-10
+        .checkbox
+          = f.label :user_default_external do
+            = f.check_box :user_default_external
+            Newly registered users will by default be external
 
   = f.submit 'Save changes', class: 'btn btn-success'