Merge branch 'robmv/gitlab-ce-issue21305'

CHANGELOG

@@ -33,6 +33,9 @@ v 8.12.3
   - Update Gitlab Shell to support low IO priority for storage moves
 
 v 8.12.2
+  - Fix "Create project" button layout when visibility options are restricted
+
+v 8.12.2 (unreleased)
   - Fix Import/Export not recognising correctly the imported services.
   - Fix snippets pagination
   - Fix List-Unsubscribe header in emails

app/views/shared/_visibility_level.html.haml

@@ -6,7 +6,7 @@
     - if can_change_visibility_level
       = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: visibility_level, form_model: form_model)
     - else
-      .col-sm-10
+      %div
         %span.info
           = visibility_level_icon(visibility_level)
           %strong

app/views/shared/_visibility_radios.html.haml

@@ -10,6 +10,6 @@
       .option-descr
         = visibility_level_description(level, form_model)
 - unless restricted_visibility_levels.empty?
-  .col-sm-10
+  %div
     %span.info
       Some visibility level settings have been restricted by the administrator.