Merge branch 'leipert-upgrade-bootstrap' into 'master'

Update to bootstrap 4.1.3

Closes #51397

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

app/assets/stylesheets/bootstrap.scss

 /*
- *  Includes specific styles from the bootstrap4 foler in node_modules
+ *  Includes specific styles from the bootstrap4 folder in node_modules
  */
 
 @import "../../../node_modules/bootstrap/scss/functions";

app/assets/stylesheets/bootstrap_migration.scss

@@ -336,3 +336,12 @@ input[type=color].form-control {
 .input-group-btn:last-child {
   @extend .input-group-append;
 }
+
+/*
+ Bootstrap 4.1.2 introduced a new default vertical alignment which breaks our icons,
+ so we need to reset the vertical alignment to the default value. See:
+ - https://gitlab.com/gitlab-org/gitlab-ce/issues/51362
+ */
+svg {
+  vertical-align: baseline;
+}

package.json

@@ -31,7 +31,7 @@
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "babel-loader": "^8.0.4",
-    "bootstrap": "4.1.1",
+    "bootstrap": "4.1.3",
     "brace-expansion": "^1.1.8",
     "cache-loader": "^1.2.2",
     "chart.js": "1.0.2",

yarn.lock

@@ -1505,10 +1505,10 @@ bootstrap-vue@^2.0.0-rc.11:
     popper.js "^1.12.9"
     vue-functional-data-merge "^2.0.5"
 
-bootstrap@4.1.1, bootstrap@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb"
-  integrity sha512-SpiDSOcbg4J/PjVSt4ny5eY6j74VbVSjROY4Fb/WIUXBV9cnb5luyR4KnPvNoXuGnBK1T+nJIWqRsvU3yP8Mcg==
+bootstrap@4.1.3, bootstrap@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+  integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
 
 boxen@^1.2.1:
   version "1.3.0"