Merge branch 'MDL-56149-master' of git://github.com/damyon/moodle

admin/roles/classes/permissions_table.php

@@ -132,7 +132,7 @@ class core_role_permissions_table extends core_role_capability_table_base {
 
         $risks = $this->get_risks($capability);
 
-        $contents = html_writer::tag('td', $risks, array('class' => 'risks'));
+        $contents = html_writer::tag('td', $risks, array('class' => 'risks text-nowrap'));
         $contents .= html_writer::tag('td', $neededroles, array('class' => 'allowedroles'));
         $contents .= html_writer::tag('td', $forbiddenroles, array('class' => 'forbiddenroles'));
         return $contents;

theme/bootstrapbase/less/moodle/bs4-compat.less

@@ -139,3 +139,7 @@
 .pull-xs-right:extend(.pull-right) {
     /* stylelint-disable-line no-empty-source */
 }
+
+.text-nowrap {
+    white-space: nowrap !important; /* stylelint-disable-line declaration-no-important */
+}

theme/bootstrapbase/style/moodle.css

@@ -19232,3 +19232,7 @@ input[type="reset"] .caret {
 .pull-xs-right {
   /* stylelint-disable-line no-empty-source */
 }
+.text-nowrap {
+  white-space: nowrap !important;
+  /* stylelint-disable-line declaration-no-important */
+}