Merge branch '12553-preferences' into 'master'

Removes EE differences for app/views/profiles/preferences/show.html.haml

Closes gitlab-ee#12553

See merge request gitlab-org/gitlab-ce!30397

app/views/profiles/preferences/show.html.haml

@@ -92,21 +92,21 @@
     .col-lg-8
       .form-group
         %h5= s_('Preferences|Time format')
-        .checkbox-icon-inline-wrapper.form-check
+        .checkbox-icon-inline-wrapper
           - time_format_label = capture do
             = s_('Preferences|Display time in 24-hour format')
-          = f.check_box :time_format_in_24h, class: 'form-check-input'
+          = f.check_box :time_format_in_24h
           = f.label :time_format_in_24h do
             = time_format_label
         %h5= s_('Preferences|Time display')
-        .checkbox-icon-inline-wrapper.form-check
+        .checkbox-icon-inline-wrapper
           - time_display_label = capture do
             = s_('Preferences|Use relative times')
-          = f.check_box :time_display_relative, class: 'form-check-input'
+          = f.check_box :time_display_relative
           = f.label :time_display_relative do
             = time_display_label
-            .text-muted
-              = s_('Preferences|For example: 30 mins ago.')
+          .form-text.text-muted
+            = s_('Preferences|For example: 30 mins ago.')
   .col-lg-4.profile-settings-sidebar
   .col-lg-8
     .form-group

changelogs/unreleased/12553-preferences.yml

+---
+title: Removes EE diff for app/views/profiles/preferences/show.html.haml
+merge_request:
+author:
+type: other